fix spec/model/notice with fabrication gem

Cyril Mougel
1 parent e3d42a62
Showing 2 changed files with 21 additions and 21 deletions Show diff stats
spec/fabricators/err_fabricator.rb
spec/models/notice_spec.rb
@@ -10,9 +10,9 @@ Fabricator :notice do
   err!
   message             'FooError: Too Much Bar'
   backtrace           { random_backtrace }
-  server_environment  'environment-name' => 'production'
+  server_environment  { {'environment-name' => 'production'} }
   request             {{ 'component' => 'foo', 'action' => 'bar' }}
-  notifier            'name' => 'Notifier', 'version' => '1', 'url' => 'http://toad.com'
+  notifier            {{ 'name' => 'Notifier', 'version' => '1', 'url' => 'http://toad.com' }}
 end
 def random_backtrace
@@ -5,19 +5,19 @@ describe Notice do
   context 'validations' do
     it 'requires a backtrace' do
-      notice = Factory.build(:notice, :backtrace => nil)
+      notice = Fabricate.build(:notice, :backtrace => nil)
       notice.should_not be_valid
       notice.errors[:backtrace].should include("can't be blank")
     end
     it 'requires the server_environment' do
-      notice = Factory.build(:notice, :server_environment => nil)
+      notice = Fabricate.build(:notice, :server_environment => nil)
       notice.should_not be_valid
       notice.errors[:server_environment].should include("can't be blank")
     end
     it 'requires the notifier' do
-      notice = Factory.build(:notice, :notifier => nil)
+      notice = Fabricate.build(:notice, :notifier => nil)
       notice.should_not be_valid
       notice.errors[:notifier].should include("can't be blank")
     end
@@ -61,8 +61,8 @@ describe Notice do
     end
     [:server_environment, :request, :notifier].each do |key|
       it "replaces . with &#46; and $ with &#36; in keys used in #{key}" do
-        err = Factory(:err)
-        notice = Factory(:notice, :err => err, key => @hash)
+        err = Fabricate(:err)
+        notice = Fabricate(:notice, :err => err, key => @hash)
         notice.send(key).should == @hash_sanitized
       end
     end
@@ -71,42 +71,42 @@ describe Notice do
   describe "user agent" do
     it "should be parsed and human-readable" do
-      notice = Factory.build(:notice, :request => {'cgi-data' => {'HTTP_USER_AGENT' => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16'}})
+      notice = Fabricate.build(:notice, :request => {'cgi-data' => {'HTTP_USER_AGENT' => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16'}})
       notice.user_agent.browser.should == 'Chrome'
       notice.user_agent.version.to_s.should =~ /^10\.0/
     end
     it "should be nil if HTTP_USER_AGENT is blank" do
-      notice = Factory.build(:notice)
+      notice = Fabricate.build(:notice)
       notice.user_agent.should == nil
     end
   end
   describe "user agent string" do
     it "should be parsed and human-readable" do
-      notice = Factory.build(:notice, :request => {'cgi-data' => {'HTTP_USER_AGENT' => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16'}})
+      notice = Fabricate.build(:notice, :request => {'cgi-data' => {'HTTP_USER_AGENT' => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-US) AppleWebKit/534.16 (KHTML, like Gecko) Chrome/10.0.648.204 Safari/534.16'}})
       notice.user_agent_string.should == 'Chrome 10.0.648.204'
     end
     it "should be nil if HTTP_USER_AGENT is blank" do
-      notice = Factory.build(:notice)
+      notice = Fabricate.build(:notice)
       notice.user_agent_string.should == "N/A"
     end
   end
   describe "host" do
     it "returns host if url is valid" do
-      notice = Factory.build(:notice, :request => {'url' => "http://example.com/resource/12"})
+      notice = Fabricate.build(:notice, :request => {'url' => "http://example.com/resource/12"})
       notice.host.should == 'example.com'
     end
-    
+
     it "returns 'N/A' when url is not valid" do
-      notice = Factory.build(:notice, :request => {'url' => "some string"})
+      notice = Fabricate.build(:notice, :request => {'url' => "some string"})
       notice.host.should == 'N/A'
     end
     it "returns 'N/A' when url is empty" do
-      notice = Factory.build(:notice, :request => {})
+      notice = Fabricate.build(:notice, :request => {})
       notice.host.should == 'N/A'
     end
@@ -118,8 +118,8 @@ describe Notice do
     before do
       Errbit::Config.per_app_email_at_notices = true
-      @app = Factory(:app_with_watcher, :email_at_notices => custom_thresholds)
-      @err = Factory(:err, :problem => Factory(:problem, :app => @app))
+      @app = Fabricate(:app_with_watcher, :email_at_notices => custom_thresholds)
+      @err = Fabricate(:err, :problem => Fabricate(:problem, :app => @app))
     end
     after do
@@ -131,7 +131,7 @@ describe Notice do
         @err.problem.stub(:notices_count).and_return(threshold)
         Mailer.should_receive(:err_notification).
           and_return(mock('email', :deliver => true))
-        Factory(:notice, :err => @err)
+        Fabricate(:notice, :err => @err)
       end
     end
   end
@@ -140,8 +140,8 @@ describe Notice do
     before do
       Errbit::Config.per_app_email_at_notices = true
-      @app = Factory(:app_with_watcher, :email_at_notices => [1])
-      @err = Factory(:err, :problem => Factory(:problem, :app => @app, :notices_count => 100))
+      @app = Fabricate(:app_with_watcher, :email_at_notices => [1])
+      @err = Fabricate(:err, :problem => Fabricate(:problem, :app => @app, :notices_count => 100))
     end
     after do
@@ -152,7 +152,7 @@ describe Notice do
       @err.problem.resolve!
       Mailer.should_receive(:err_notification).
         and_return(mock('email', :deliver => true))
-      Factory(:notice, :err => @err)
+      Fabricate(:notice, :err => @err)
     end
   end
 end
	@@ -10,9 +10,9 @@ Fabricator :notice do		@@ -10,9 +10,9 @@ Fabricator :notice do
10	err!	10	err!
11	message 'FooError: Too Much Bar'	11	message 'FooError: Too Much Bar'
12	backtrace { random_backtrace }	12	backtrace { random_backtrace }
13	- server_environment 'environment-name' => 'production'	13	+ server_environment { {'environment-name' => 'production'} }
14	request {{ 'component' => 'foo', 'action' => 'bar' }}	14	request {{ 'component' => 'foo', 'action' => 'bar' }}
15	- notifier 'name' => 'Notifier', 'version' => '1', 'url' => 'http://toad.com'	15	+ notifier {{ 'name' => 'Notifier', 'version' => '1', 'url' => 'http://toad.com' }}
16	end	16	end
17		17
18	def random_backtrace	18	def random_backtrace