Merge branch 'coverage-calc' into 'master'

Use builds_without_retry to calculate average coverage

/cc @vsizov

See merge request !197

2 files changed, 13 insertions, 6 deletions

diff --git a/app/models/commit.rb b/app/models/commit.rb
index 3680220..e173ed4 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -211,8 +211,8 @@ class Commit < ActiveRecord::Base
   end
 
   def coverage
-    if project.coverage_enabled? && builds.count(:all) > 0
-      coverage_array = builds.map(&:coverage).compact
+    if project.coverage_enabled?
+      coverage_array = builds_without_retry.map(&:coverage).compact
       if coverage_array.size >= 1
         '%.2f' % (coverage_array.reduce(:+) / coverage_array.size)
       end
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index 14d6d99..0038e36 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -167,18 +167,25 @@ describe Commit do
     let(:commit) { FactoryGirl.create :commit, project: project }
 
     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
+      FactoryGirl.create :build, name: "rspec", coverage: 30, commit: commit
+      FactoryGirl.create :build, name: "rubocop", coverage: 40, commit: commit
       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, name: "rspec", coverage: 30, commit: commit
+      FactoryGirl.create :build, name: "rubocop", coverage: 40, commit: commit
       FactoryGirl.create :build, commit: commit
       commit.coverage.should == "35.00"
     end
 
+    it "calculates average when there are two builds with coverage and one is retried" do
+      FactoryGirl.create :build, name: "rspec", coverage: 30, commit: commit
+      FactoryGirl.create :build, name: "rubocop", coverage: 30, commit: commit
+      FactoryGirl.create :build, name: "rubocop", coverage: 40, commit: commit
+      commit.coverage.should == "35.00"
+    end
+
     it "calculates average when there is one build without coverage" do
       FactoryGirl.create :build, commit: commit
       commit.coverage.should be_nil