Calculate artifact size properly

946afebd · Matija Čupić · 54a3ec47 · 946afebd · 946afebd
--- a/app/controllers/projects/artifacts_controller.rb
+++ b/app/controllers/projects/artifacts_controller.rb
@@ -17,8 +17,10 @@ class Projects::ArtifactsController < Projects::ApplicationController

  def index
    finder = ArtifactsFinder.new(@project, artifacts_params)
-    @artifacts = finder.execute.page(params[:page]).per(MAX_PER_PAGE)
-    @total_size = @artifacts.total_size
+    all_artifacts = finder.execute
+
+    @artifacts = all_artifacts.page(params[:page]).per(MAX_PER_PAGE)
+    @total_size = all_artifacts.total_size
  end

  def destroy

--- a/spec/controllers/projects/artifacts_controller_spec.rb
+++ b/spec/controllers/projects/artifacts_controller_spec.rb
@@ -29,6 +29,12 @@
      expect(assigns(:artifacts)).to contain_exactly(*project.job_artifacts)
    end

+    it 'sets the total size variable' do
+      subject
+
+      expect(assigns(:total_size)).to eq(project.job_artifacts.total_size)
+    end
+
    describe 'pagination' do
      before do
        stub_const("#{described_class}::MAX_PER_PAGE", 1)