Add a flag that will cause deploys to resolve all errs for the given project

Jared Pace
1 parent 25a79373
Showing 5 changed files with 33 additions and 0 deletions Show diff stats
app/models/deploy.rb
app/models/project.rb
app/views/projects/_fields.html.haml
public/stylesheets/application.css
spec/models/deploy_spec.rb
@@ -10,6 +10,7 @@ class Deploy
   embedded_in :project, :inverse_of => :deploys
   after_create :deliver_notification, :if => :should_notify?
+  after_create :resolve_project_errs, :if => :should_resolve_project_errs?
   validates_presence_of :username, :environment
@@ -17,10 +18,18 @@ class Deploy
     Mailer.deploy_notification(self).deliver
   end
+  def resolve_project_errs
+    project.errs.unresolved.each {|err| err.resolve!}
+  end
+  
   protected
     def should_notify?
       project.watchers.any?
     end
+    
+    def should_resolve_project_errs?
+      project.resolve_errs_on_deploy?
+    end
 end
@@ -4,6 +4,7 @@ class Project
   field :name, :type => String
   field :api_key
+  field :resolve_errs_on_deploy, :type => Boolean, :default => false
   key :name
   embeds_many :watchers
@@ -2,6 +2,10 @@
   = f.label :name
   = f.text_field :name
+%div.checkbox
+  = f.check_box :resolve_errs_on_deploy
+  = f.label :resolve_errs_on_deploy, 'Resolve errors on deploy'
+  
 %fieldset.nested-wrapper
   %legend Watchers
   - f.fields_for :watchers do |w|
@@ -122,6 +122,7 @@ form label {
   display: block; 
 }
 form label.inline { display: inline; }
+form .checkbox label { display: inline; }
 form .required label { color: #BF3838;}
 form input[type=text], form input[type=password] {
   width: 96%; padding: 0.8em;
@@ -22,6 +22,24 @@ describe Deploy do
         and_return(mock('email', :deliver => true))
       Factory(:deploy, :project => Factory(:project_with_watcher))
     end
+    
+    context 'when the project has resolve_errs_on_deploy set to false' do
+      it 'should not resolve the projects errs' do
+        project = Factory(:project, :resolve_errs_on_deploy => false)
+        @errs = 3.times.inject([]) {|errs,_| errs << Factory(:err, :resolved => false, :project => project)}
+        Factory(:deploy, :project => project)
+        project.reload.errs.none?{|err| err.resolved?}.should == true
+      end
+    end
+    
+    context 'when the project has resolve_errs_on_deploy set to true' do
+      it 'should not resolve the projects errs' do
+        project = Factory(:project, :resolve_errs_on_deploy => true)
+        @errs = 3.times.inject([]) {|errs,_| errs << Factory(:err, :resolved => false, :project => project)}
+        Factory(:deploy, :project => project)
+        project.reload.errs.all?{|err| err.resolved?}.should == true
+      end
+    end
   end
 end
	@@ -4,6 +4,7 @@ class Project		@@ -4,6 +4,7 @@ class Project
4		4
5	field :name, :type => String	5	field :name, :type => String
6	field :api_key	6	field :api_key
		7	+ field :resolve_errs_on_deploy, :type => Boolean, :default => false
7	key :name	8	key :name
8		9
9	embeds_many :watchers	10	embeds_many :watchers
	@@ -22,6 +22,24 @@ describe Deploy do		@@ -22,6 +22,24 @@ describe Deploy do
22	and_return(mock('email', :deliver => true))	22	and_return(mock('email', :deliver => true))
23	Factory(:deploy, :project => Factory(:project_with_watcher))	23	Factory(:deploy, :project => Factory(:project_with_watcher))
24	end	24	end
		25	+
		26	+ context 'when the project has resolve_errs_on_deploy set to false' do
		27	+ it 'should not resolve the projects errs' do
		28	+ project = Factory(:project, :resolve_errs_on_deploy => false)
		29	+ @errs = 3.times.inject([]) {\|errs,_\| errs << Factory(:err, :resolved => false, :project => project)}
		30	+ Factory(:deploy, :project => project)
		31	+ project.reload.errs.none?{\|err\| err.resolved?}.should == true
		32	+ end
		33	+ end
		34	+
		35	+ context 'when the project has resolve_errs_on_deploy set to true' do
		36	+ it 'should not resolve the projects errs' do
		37	+ project = Factory(:project, :resolve_errs_on_deploy => true)
		38	+ @errs = 3.times.inject([]) {\|errs,_\| errs << Factory(:err, :resolved => false, :project => project)}
		39	+ Factory(:deploy, :project => project)
		40	+ project.reload.errs.all?{\|err\| err.resolved?}.should == true
		41	+ end
		42	+ end
25	end	43	end
26		44
27	end	45	end