badget is passing only when warnings_count is 0

richardsondx · Jun 25, 2012 · 095ccbf · 095ccbf
1 parent 69b5999
commit 095ccbf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/app/models/build.rb b/app/models/build.rb
@@ -17,7 +17,6 @@
 
 class Build < ActiveRecord::Base
   include AASM
-  BADGE_STATES = {completed: "passing", failed: "failing", scheduled: "unknown", running: "unknown"}
 
   belongs_to :repository, counter_cache: true
   attr_accessible :branch, :duration, :finished_at, :last_commit_id, :last_commit_message, :position
@@ -86,7 +85,11 @@ def short_commit_id
   end
 
   def badge_state
-    BADGE_STATES[aasm_state.to_sym]
+    if "completed" == aasm_state
+      warnings_count > 0 ? "failing" : "passing"
+    else
+      "unknown"
+    end
   end
 
   protected

diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
@@ -37,16 +37,19 @@
 
   context "#badge_status" do
     it "should be passing" do
-      build = FactoryGirl.build_stubbed(:build, aasm_state: "completed")
+      build = FactoryGirl.build_stubbed(:build, aasm_state: "completed", warnings_count: 0)
       build.badge_state.should == "passing"
     end
 
     it "should be failing" do
-      build = FactoryGirl.build_stubbed(:build, aasm_state: "failed")
+      build = FactoryGirl.build_stubbed(:build, aasm_state: "completed", warnings_count: 1)
       build.badge_state.should == "failing"
     end
 
     it "should be unknown" do
+      build = FactoryGirl.build_stubbed(:build, aasm_state: "failed")
+      build.badge_state.should == "unknown"
+
       build = FactoryGirl.build_stubbed(:build, aasm_state: "scheduled")
       build.badge_state.should == "unknown"