Only resolve errs on deploy which are in the same environment

Jared Pace
1 parent 52b9cafb
Showing 3 changed files with 8 additions and 5 deletions Show diff stats
app/models/deploy.rb
app/models/err.rb
spec/models/deploy_spec.rb
@@ -19,7 +19,7 @@ class Deploy
   end
   def resolve_app_errs
-    app.errs.unresolved.each {|err| err.resolve!}
+    app.errs.unresolved.in_env(environment).each {|err| err.resolve!}
   end
   protected
@@ -18,6 +18,7 @@ class Err
   scope :resolved, where(:resolved => true)
   scope :unresolved, where(:resolved => false)
   scope :ordered, order_by(:last_notice_at.desc)
+  scope :in_env, lambda {|env| where(:environment => env)}
   def self.for(attrs)
     app = attrs.delete(:app)
@@ -33,11 +33,13 @@ describe Deploy do
     end
     context 'when the app has resolve_errs_on_deploy set to true' do
-      it 'should not resolve the apps errs' do
+      it 'should resolve the apps errs that were in the same environment' do
         app = Factory(:app, :resolve_errs_on_deploy => true)
-        @errs = 3.times.inject([]) {|errs,_| errs << Factory(:err, :resolved => false, :app => app)}
-        Factory(:deploy, :app => app)
-        app.reload.errs.all?{|err| err.resolved?}.should == true
+        @prod_errs = 3.times.inject([]) {|errs,_| errs << Factory(:err, :resolved => false, :app => app, :environment => 'production')}
+        @staging_errs = 3.times.inject([]) {|errs,_| errs << Factory(:err, :resolved => false, :app => app, :environment => 'staging')}
+        Factory(:deploy, :app => app, :environment => 'production')
+        @prod_errs.all?{|err| err.reload.resolved?}.should == true
+        @staging_errs.all?{|err| err.reload.resolved?}.should == false
       end
     end
   end
	@@ -19,7 +19,7 @@ class Deploy		@@ -19,7 +19,7 @@ class Deploy
19	end	19	end
20		20
21	def resolve_app_errs	21	def resolve_app_errs
22	- app.errs.unresolved.each {\|err\| err.resolve!}	22	+ app.errs.unresolved.in_env(environment).each {\|err\| err.resolve!}
23	end	23	end
24		24
25	protected	25	protected
	@@ -18,6 +18,7 @@ class Err		@@ -18,6 +18,7 @@ class Err
18	scope :resolved, where(:resolved => true)	18	scope :resolved, where(:resolved => true)
19	scope :unresolved, where(:resolved => false)	19	scope :unresolved, where(:resolved => false)
20	scope :ordered, order_by(:last_notice_at.desc)	20	scope :ordered, order_by(:last_notice_at.desc)
		21	+ scope :in_env, lambda {\|env\| where(:environment => env)}
21		22
22	def self.for(attrs)	23	def self.for(attrs)
23	app = attrs.delete(:app)	24	app = attrs.delete(:app)