Merge branch 'coverage' into 'master'

Rounded coverage on commit page https://dev.gitlab.org/gitlab/gitlab-ci/issues/312 See merge request !184
gitlabhq · Jul 1, 2015 · 52e0d47 · 52e0d47
2 parents 859e0b4 + 25729b0
commit 52e0d47
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/models/commit.rb b/app/models/commit.rb
@@ -208,7 +208,7 @@ def coverage
     if project.coverage_enabled? && builds.count(:all) > 0
       coverage_array = builds.map(&:coverage).compact
       if coverage_array.size >= 1
-        coverage_array.reduce(:+) / coverage_array.size
+        '%.2f' % (coverage_array.reduce(:+) / coverage_array.size)
       end
     end
   end

diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
@@ -167,14 +167,14 @@
     it "calculates average when there are two builds with coverage" do
       FactoryGirl.create :build, coverage: 30, commit: commit
       FactoryGirl.create :build, coverage: 40, commit: commit
-      commit.coverage.should == 35.0
+      commit.coverage.should == "35.00"
     end
 
     it "calculates average when there are two builds with coverage and one with nil" do
       FactoryGirl.create :build, coverage: 30, commit: commit
       FactoryGirl.create :build, coverage: 40, commit: commit
       FactoryGirl.create :build, commit: commit
-      commit.coverage.should == 35.0
+      commit.coverage.should == "35.00"
     end
 
     it "calculates average when there is one build without coverage" do