fix spec/controller/deploy_controller with fabrication_gem

Cyril Mougel
1 parent a308ea35
Showing 3 changed files with 5 additions and 7 deletions Show diff stats
spec/controllers/deploys_controller_spec.rb
spec/fabricators/app_fabricator.rb
spec/fabricators/sequences_fabricator.rb
@@ -12,7 +12,7 @@ describe DeploysController do
         'scm_revision'   => '19d77837eef37902cf5df7e4445c85f392a8d0d5',
         'message'        => 'johns first deploy'
       }
-      @app = Factory(:app_with_watcher, :notify_on_deploys => true, :api_key => 'APIKEY')
+      @app = Fabricate(:app_with_watcher, :notify_on_deploys => true, :api_key => 'APIKEY')
     end
  
     it 'finds the app via the api key' do
@@ -30,7 +30,7 @@ describe DeploysController do
           :revision     => '19d77837eef37902cf5df7e4445c85f392a8d0d5',
           :message      => 'johns first deploy'
  
-        }).and_return(Factory(:deploy))
+        }).and_return(Fabricate(:deploy))
       post :create, :deploy => @params, :api_key => 'APIKEY'
     end
  
@@ -45,8 +45,8 @@ describe DeploysController do
  
   context "GET #index" do
     before(:each) do
-      @deploy = Factory :deploy
-      sign_in Factory(:admin)
+      @deploy = Fabricate :deploy
+      sign_in Fabricate(:admin)
       get :index, :app_id => @deploy.app.id
     end
  
@@ -9,7 +9,7 @@ end
 Fabricator(:watcher) do
   app!
   watcher_type 'email'
-  email   { sequence(:email) }
+  email   { sequence(:email){|n| "email#{n}@example.com"} }
 end
  
 Fabricator(:user_watcher, :from => :watcher) do
 Fabricate.sequence(:name) {|n| "John #{n} Doe"}
 Fabricate.sequence(:word) {|n| "word#{n}"}
-Fabricate.sequence(:email) {|n| "email#{n}@example.com"}
-Fabricate.sequence(:user_email) {|n| "user.#{n}@example.com"}
...	...	@@ -12,7 +12,7 @@ describe DeploysController do
12	12	'scm_revision' => '19d77837eef37902cf5df7e4445c85f392a8d0d5',
13	13	'message' => 'johns first deploy'
14	14	}
15		- @app = Factory(:app_with_watcher, :notify_on_deploys => true, :api_key => 'APIKEY')
	15	+ @app = Fabricate(:app_with_watcher, :notify_on_deploys => true, :api_key => 'APIKEY')
16	16	end
17	17
18	18	it 'finds the app via the api key' do
...	...	@@ -30,7 +30,7 @@ describe DeploysController do
30	30	:revision => '19d77837eef37902cf5df7e4445c85f392a8d0d5',
31	31	:message => 'johns first deploy'
32	32
33		- }).and_return(Factory(:deploy))
	33	+ }).and_return(Fabricate(:deploy))
34	34	post :create, :deploy => @params, :api_key => 'APIKEY'
35	35	end
36	36
...	...	@@ -45,8 +45,8 @@ describe DeploysController do
45	45
46	46	context "GET #index" do
47	47	before(:each) do
48		- @deploy = Factory :deploy
49		- sign_in Factory(:admin)
	48	+ @deploy = Fabricate :deploy
	49	+ sign_in Fabricate(:admin)
50	50	get :index, :app_id => @deploy.app.id
51	51	end
52	52
...	...
...	...	@@ -9,7 +9,7 @@ end
9	9	Fabricator(:watcher) do
10	10	app!
11	11	watcher_type 'email'
12		- email { sequence(:email) }
	12	+ email { sequence(:email){\|n\| "email#{n}@example.com"} }
13	13	end
14	14
15	15	Fabricator(:user_watcher, :from => :watcher) do
...	...
1	1	Fabricate.sequence(:name) {\|n\| "John #{n} Doe"}
2	2	Fabricate.sequence(:word) {\|n\| "word#{n}"}
3		-Fabricate.sequence(:email) {\|n\| "email#{n}@example.com"}
4		-Fabricate.sequence(:user_email) {\|n\| "user.#{n}@example.com"}
5	3
...	...