Merge pull request #134 from shingara/fabrication_gem

Migration from factory girls to Fabrication Gem

Merge pull request #134 from shingara/fabrication_gem
Migration from factory girls to Fabrication Gem
Nathan B
2 parents e5875d94 de1cd644
Showing 42 changed files with 397 additions and 378 deletions Show diff stats
Gemfile
Gemfile.lock
app/models/problem.rb
config/application.rb
spec/controllers/apps_controller_spec.rb
spec/controllers/deploys_controller_spec.rb
spec/controllers/errs_controller_spec.rb
spec/controllers/notices_controller_spec.rb
spec/controllers/users_controller_spec.rb
spec/fabricators/app_fabricator.rb
spec/fabricators/comment_fabricator.rb
spec/fabricators/err_fabricator.rb
spec/fabricators/issue_tracker_fabricator.rb
spec/fabricators/problem_fabricator.rb
spec/fabricators/sequences_fabricator.rb
spec/fabricators/user_fabricator.rb
spec/factories.rb
spec/factories/app_factories.rb
spec/factories/comment_factories.rb
spec/factories/err_factories.rb
@@ -31,8 +31,7 @@ gem &#39;ri_cal&#39;
 group :development, :test do
   gem 'rspec-rails', '~> 2.6'
   gem 'webmock', :require => false
-  gem 'factory_girl', '~> 1.3.3'
-  gem 'factory_girl_rails', '~> 1.0.1'
+  gem 'fabrication'
   unless ENV['TRAVIS']
     gem 'ruby-debug', :platform => :mri_18
     gem 'ruby-debug19', :platform => :mri_19, :require => 'ruby-debug'
@@ -55,10 +55,7 @@ GEM
       rspec (~> 2.0)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    factory_girl (1.3.3)
-    factory_girl_rails (1.0.1)
-      factory_girl (~> 1.3)
-      railties (>= 3.0.0)
+    fabrication (1.2.0)
     faraday (0.7.4)
       addressable (~> 2.2.6)
       multipart-post (~> 1.1.0)
@@ -219,8 +216,7 @@ DEPENDENCIES
   database_cleaner (~> 0.6.0)
   devise (~> 1.4.0)
   email_spec
-  factory_girl (~> 1.3.3)
-  factory_girl_rails (~> 1.0.1)
+  fabrication
   haml
   hoptoad_notifier (~> 2.4)
   htmlentities (~> 4.3.0)
@@ -116,7 +116,9 @@ class Problem
       self.last_deploy_at = if (last_deploy = app.deploys.where(:environment => self.environment).last)
         last_deploy.created_at
       end
-      self.save if persisted?
+      collection.update({'_id' => self.id},
+                        {'$set' => {'app_name' => self.app_name,
+                          'last_deploy_at' => self.last_deploy_at}})
     end
   end
  
@@ -45,6 +45,7 @@ module Errbit
       g.orm             :mongoid
       g.template_engine :haml
       g.test_framework  :rspec, :fixture => false
+      g.fixture_replacement :fabrication
     end
  
     # IssueTracker subclasses use inheritance, so preloading models provides querying consistency in dev mode.
@@ -10,8 +10,8 @@ describe AppsController do
   describe "GET /apps" do
     context 'when logged in as an admin' do
       it 'finds all apps' do
-        sign_in Factory(:admin)
-        3.times { Factory(:app) }
+        sign_in Fabricate(:admin)
+        3.times { Fabricate(:app) }
         apps = App.all
         get :index
         assigns(:apps).should == apps
@@ -20,12 +20,12 @@ describe AppsController do
  
     context 'when logged in as a regular user' do
       it 'finds apps the user is watching' do
-        sign_in(user = Factory(:user))
-        unwatched_app = Factory(:app)
-        watched_app1 = Factory(:app)
-        watched_app2 = Factory(:app)
-        Factory(:user_watcher, :user => user, :app => watched_app1)
-        Factory(:user_watcher, :user => user, :app => watched_app2)
+        sign_in(user = Fabricate(:user))
+        unwatched_app = Fabricate(:app)
+        watched_app1 = Fabricate(:app)
+        watched_app2 = Fabricate(:app)
+        Fabricate(:user_watcher, :user => user, :app => watched_app1)
+        Fabricate(:user_watcher, :user => user, :app => watched_app2)
         get :index
         assigns(:apps).should include(watched_app1, watched_app2)
         assigns(:apps).should_not include(unwatched_app)
@@ -36,10 +36,10 @@ describe AppsController do
   describe "GET /apps/:id" do
     context 'logged in as an admin' do
       before(:each) do
-        @user = Factory(:admin)
+        @user = Fabricate(:admin)
         sign_in @user
-        @app = Factory(:app)
-        @problem = Factory(:notice, :err => Factory(:err, :problem => Factory(:problem, :app => @app))).problem
+        @app = Fabricate(:app)
+        @problem = Fabricate(:notice, :err => Fabricate(:err, :problem => Fabricate(:problem, :app => @app))).problem
       end
  
       it 'finds the app' do
@@ -48,7 +48,7 @@ describe AppsController do
       end
  
       it "should not raise errors for app with err without notices" do
-        Factory(:err, :problem => Factory(:problem, :app => @app))
+        Fabricate(:err, :problem => Fabricate(:problem, :app => @app))
         lambda { get :show, :id => @app.id }.should_not raise_error
       end
  
@@ -60,7 +60,7 @@ describe AppsController do
  
       context "pagination" do
         before(:each) do
-          35.times { Factory(:err, :problem => Factory(:problem, :app => @app)) }
+          35.times { Fabricate(:err, :problem => Fabricate(:problem, :app => @app)) }
         end
  
         it "should have default per_page value for user" do
@@ -77,8 +77,8 @@ describe AppsController do
  
       context 'with resolved errors' do
         before(:each) do
-          resolved_problem = Factory(:problem, :app => @app)
-          Factory(:notice, :err => Factory(:err, :problem => resolved_problem))
+          resolved_problem = Fabricate(:problem, :app => @app)
+          Fabricate(:notice, :err => Fabricate(:err, :problem => resolved_problem))
           resolved_problem.resolve!
         end
  
@@ -101,7 +101,7 @@ describe AppsController do
         before(:each) do
           environments = ['production', 'test', 'development', 'staging']
           20.times do |i|
-            Factory.create(:problem, :app => @app, :environment => environments[i % environments.length])
+            Fabricate(:problem, :app => @app, :environment => environments[i % environments.length])
           end
         end
  
@@ -144,17 +144,17 @@ describe AppsController do
  
     context 'logged in as a user' do
       it 'finds the app if the user is watching it' do
-        user = Factory(:user)
-        app = Factory(:app)
-        watcher = Factory(:user_watcher, :app => app, :user => user)
+        user = Fabricate(:user)
+        app = Fabricate(:app)
+        watcher = Fabricate(:user_watcher, :app => app, :user => user)
         sign_in user
         get :show, :id => app.id
         assigns(:app).should == app
       end
  
       it 'does not find the app if the user is not watching it' do
-        sign_in Factory(:user)
-        app = Factory(:app)
+        sign_in Fabricate(:user)
+        app = Fabricate(:app)
         lambda {
           get :show, :id => app.id
         }.should raise_error(Mongoid::Errors::DocumentNotFound)
@@ -164,7 +164,7 @@ describe AppsController do
  
   context 'logged in as an admin' do
     before do
-      sign_in Factory(:admin)
+      sign_in Fabricate(:admin)
     end
  
     describe "GET /apps/new" do
@@ -176,7 +176,7 @@ describe AppsController do
       end
  
       it "should copy attributes from an existing app" do
-        @app = Factory(:app, :name => "do not copy",
+        @app = Fabricate(:app, :name => "do not copy",
                              :github_url => "github.com/test/example")
         get :new, :copy_attributes_from => @app.id
         assigns(:app).should be_a(App)
@@ -188,7 +188,7 @@ describe AppsController do
  
     describe "GET /apps/:id/edit" do
       it 'finds the correct app' do
-        app = Factory(:app)
+        app = Fabricate(:app)
         get :edit, :id => app.id
         assigns(:app).should == app
       end
@@ -196,7 +196,7 @@ describe AppsController do
  
     describe "POST /apps" do
       before do
-        @app = Factory(:app)
+        @app = Fabricate(:app)
         App.stub(:new).and_return(@app)
       end
  
@@ -219,7 +219,7 @@ describe AppsController do
  
     describe "PUT /apps/:id" do
       before do
-        @app = Factory(:app)
+        @app = Fabricate(:app)
       end
  
       context "when the update is successful" do
@@ -257,7 +257,7 @@ describe AppsController do
         end
         context "failed parsing of CSV" do
           it "should set the default value" do
-            @app = Factory(:app, :email_at_notices => [1, 2, 3, 4])
+            @app = Fabricate(:app, :email_at_notices => [1, 2, 3, 4])
             put :update, :id => @app.id, :app => { :email_at_notices => 'asdf, -1,0,foobar,gd00,0,abc' }
             @app.reload
             @app.email_at_notices.should == Errbit::Config.email_at_notices
@@ -320,7 +320,7 @@ describe AppsController do
  
     describe "DELETE /apps/:id" do
       before do
-        @app = Factory(:app)
+        @app = Fabricate(:app)
         App.stub(:find).with(@app.id).and_return(@app)
       end
  
@@ -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
  
@@ -7,17 +7,17 @@ describe ErrsController do
   },
   :params => {:app_id => 'dummyid', :id => 'dummyid'}
  
-  let(:app) { Factory(:app) }
-  let(:err) { Factory(:err, :problem => Factory(:problem, :app => app, :environment => "production")) }
+  let(:app) { Fabricate(:app) }
+  let(:err) { Fabricate(:err, :problem => Fabricate(:problem, :app => app, :environment => "production")) }
  
  
   describe "GET /errs" do
     render_views
     context 'when logged in as an admin' do
       before(:each) do
-        @user = Factory(:admin)
+        @user = Fabricate(:admin)
         sign_in @user
-        @problem = Factory(:notice, :err => Factory(:err, :problem => Factory(:problem, :app => app, :environment => "production"))).problem
+        @problem = Fabricate(:notice, :err => Fabricate(:err, :problem => Fabricate(:problem, :app => app, :environment => "production"))).problem
       end
  
       it "should successfully list errs" do
@@ -34,7 +34,7 @@ describe ErrsController do
  
       context "pagination" do
         before(:each) do
-          35.times { Factory :err }
+          35.times { Fabricate :err }
         end
  
         it "should have default per_page value for user" do
@@ -53,7 +53,7 @@ describe ErrsController do
         before(:each) do
           environments = ['production', 'test', 'development', 'staging']
           20.times do |i|
-            Factory(:problem, :environment => environments[i % environments.length])
+            Fabricate(:problem, :environment => environments[i % environments.length])
           end
         end
  
@@ -96,10 +96,10 @@ describe ErrsController do
  
     context 'when logged in as a user' do
       it 'gets a paginated list of unresolved errs for the users apps' do
-        sign_in(user = Factory(:user))
-        unwatched_err = Factory(:err)
-        watched_unresolved_err = Factory(:err, :problem => Factory(:problem, :app => Factory(:user_watcher, :user => user).app, :resolved => false))
-        watched_resolved_err = Factory(:err, :problem => Factory(:problem, :app => Factory(:user_watcher, :user => user).app, :resolved => true))
+        sign_in(user = Fabricate(:user))
+        unwatched_err = Fabricate(:err)
+        watched_unresolved_err = Fabricate(:err, :problem => Fabricate(:problem, :app => Fabricate(:user_watcher, :user => user).app, :resolved => false))
+        watched_resolved_err = Fabricate(:err, :problem => Fabricate(:problem, :app => Fabricate(:user_watcher, :user => user).app, :resolved => true))
         get :index
         assigns(:problems).should include(watched_unresolved_err.problem)
         assigns(:problems).should_not include(unwatched_err.problem, watched_resolved_err.problem)
@@ -110,10 +110,10 @@ describe ErrsController do
   describe "GET /errs/all" do
     context 'when logged in as an admin' do
       it "gets a paginated list of all errs" do
-        sign_in Factory(:admin)
+        sign_in Fabricate(:admin)
         errs = Kaminari.paginate_array((1..30).to_a)
-        3.times { errs << Factory(:err).problem }
-        3.times { errs << Factory(:err, :problem => Factory(:problem, :resolved => true)).problem }
+        3.times { errs << Fabricate(:err).problem }
+        3.times { errs << Fabricate(:err, :problem => Fabricate(:problem, :resolved => true)).problem }
         Problem.should_receive(:ordered).and_return(
           mock('proxy', :page => mock('other_proxy', :per => errs))
         )
@@ -124,10 +124,10 @@ describe ErrsController do
  
     context 'when logged in as a user' do
       it 'gets a paginated list of all errs for the users apps' do
-        sign_in(user = Factory(:user))
-        unwatched_err = Factory(:problem)
-        watched_unresolved_err = Factory(:problem, :app => Factory(:user_watcher, :user => user).app, :resolved => false)
-        watched_resolved_err = Factory(:problem, :app => Factory(:user_watcher, :user => user).app, :resolved => true)
+        sign_in(user = Fabricate(:user))
+        unwatched_err = Fabricate(:problem)
+        watched_unresolved_err = Fabricate(:problem, :app => Fabricate(:user_watcher, :user => user).app, :resolved => false)
+        watched_resolved_err = Fabricate(:problem, :app => Fabricate(:user_watcher, :user => user).app, :resolved => true)
         get :all
         assigns(:problems).should include(watched_resolved_err, watched_unresolved_err)
         assigns(:problems).should_not include(unwatched_err)
@@ -139,12 +139,12 @@ describe ErrsController do
     render_views
  
     before do
-      3.times { Factory(:notice, :err => err)}
+      3.times { Fabricate(:notice, :err => err)}
     end
  
     context 'when logged in as an admin' do
       before do
-        sign_in Factory(:admin)
+        sign_in Fabricate(:admin)
       end
  
       it "finds the app" do
@@ -166,23 +166,23 @@ describe ErrsController do
         let(:button_matcher) { match(/create issue/) }
  
         it "should not exist for err's app without issue tracker" do
-          err = Factory :err
+          err = Fabricate :err
           get :show, :app_id => err.app.id, :id => err.problem.id
  
           response.body.should_not button_matcher
         end
  
         it "should exist for err's app with issue tracker" do
-          tracker = Factory(:lighthouse_tracker)
-          err = Factory(:err, :problem => Factory(:problem, :app => tracker.app))
+          tracker = Fabricate(:lighthouse_tracker)
+          err = Fabricate(:err, :problem => Fabricate(:problem, :app => tracker.app))
           get :show, :app_id => err.app.id, :id => err.problem.id
  
           response.body.should button_matcher
         end
  
         it "should not exist for err with issue_link" do
-          tracker = Factory(:lighthouse_tracker)
-          err = Factory(:err, :problem => Factory(:problem, :app => tracker.app, :issue_link => "http://some.host"))
+          tracker = Fabricate(:lighthouse_tracker)
+          err = Fabricate(:err, :problem => Fabricate(:problem, :app => tracker.app, :issue_link => "http://some.host"))
           get :show, :app_id => err.app.id, :id => err.problem.id
  
           response.body.should_not button_matcher
@@ -192,11 +192,11 @@ describe ErrsController do
  
     context 'when logged in as a user' do
       before do
-        sign_in(@user = Factory(:user))
-        @unwatched_err = Factory(:err)
-        @watched_app = Factory(:app)
-        @watcher = Factory(:user_watcher, :user => @user, :app => @watched_app)
-        @watched_err = Factory(:err, :problem => Factory(:problem, :app => @watched_app))
+        sign_in(@user = Fabricate(:user))
+        @unwatched_err = Fabricate(:err)
+        @watched_app = Fabricate(:app)
+        @watcher = Fabricate(:user_watcher, :user => @user, :app => @watched_app)
+        @watched_err = Fabricate(:err, :problem => Fabricate(:problem, :app => @watched_app))
       end
  
       it 'finds the err if the user is watching the app' do
@@ -214,9 +214,9 @@ describe ErrsController do
  
   describe "PUT /apps/:app_id/errs/:id/resolve" do
     before do
-      sign_in Factory(:admin)
+      sign_in Fabricate(:admin)
  
-      @problem = Factory(:err)
+      @problem = Fabricate(:err)
       App.stub(:find).with(@problem.app.id).and_return(@problem.app)
       @problem.app.problems.stub(:find).and_return(@problem.problem)
       @problem.problem.stub(:resolve!)
@@ -256,13 +256,13 @@ describe ErrsController do
     render_views
  
     before(:each) do
-      sign_in Factory(:admin)
+      sign_in Fabricate(:admin)
     end
  
     context "successful issue creation" do
       context "lighthouseapp tracker" do
-        let(:notice) { Factory :notice }
-        let(:tracker) { Factory :lighthouse_tracker, :app => notice.app }
+        let(:notice) { Fabricate :notice }
+        let(:tracker) { Fabricate :lighthouse_tracker, :app => notice.app }
         let(:problem) { notice.problem }
  
         before(:each) do
@@ -283,7 +283,7 @@ describe ErrsController do
     end
  
     context "absent issue tracker" do
-      let(:problem) { Factory :problem }
+      let(:problem) { Fabricate :problem }
  
       before(:each) do
         post :create_issue, :app_id => problem.app.id, :id => problem.id
@@ -300,8 +300,8 @@ describe ErrsController do
  
     context "error during request to a tracker" do
       context "lighthouseapp tracker" do
-        let(:tracker) { Factory :lighthouse_tracker }
-        let(:err) { Factory(:err, :problem => Factory(:problem, :app => tracker.app)) }
+        let(:tracker) { Fabricate :lighthouse_tracker }
+        let(:err) { Fabricate(:err, :problem => Fabricate(:problem, :app => tracker.app)) }
  
         before(:each) do
           stub_request(:post, "http://#{tracker.account}.lighthouseapp.com/projects/#{tracker.project_id}/tickets.xml").to_return(:status => 500)
@@ -322,11 +322,11 @@ describe ErrsController do
  
   describe "DELETE /apps/:app_id/errs/:id/unlink_issue" do
     before(:each) do
-      sign_in Factory(:admin)
+      sign_in Fabricate(:admin)
     end
  
     context "err with issue" do
-      let(:err) { Factory(:err, :problem => Factory(:problem, :issue_link => "http://some.host")) }
+      let(:err) { Fabricate(:err, :problem => Fabricate(:problem, :issue_link => "http://some.host")) }
  
       before(:each) do
         delete :unlink_issue, :app_id => err.app.id, :id => err.problem.id
@@ -343,7 +343,7 @@ describe ErrsController do
     end
  
     context "err without issue" do
-      let(:err) { Factory :err }
+      let(:err) { Fabricate :err }
  
       before(:each) do
         delete :unlink_issue, :app_id => err.app.id, :id => err.problem.id
@@ -361,12 +361,12 @@ describe ErrsController do
     render_views
  
     before(:each) do
-      sign_in Factory(:admin)
+      sign_in Fabricate(:admin)
     end
  
     context "successful comment creation" do
-      let(:problem) { Factory(:problem) }
-      let(:user) { Factory(:user) }
+      let(:problem) { Fabricate(:problem) }
+      let(:user) { Fabricate(:user) }
  
       before(:each) do
         post :create_comment, :app_id => problem.app.id, :id => problem.id,
@@ -388,15 +388,15 @@ describe ErrsController do
     render_views
  
     before(:each) do
-      sign_in Factory(:admin)
+      sign_in Fabricate(:admin)
     end
  
     context "successful comment deletion" do
-      let(:problem) { Factory(:problem_with_comments) }
-      let(:comment) { problem.comments.first }
+      let(:problem) { Fabricate(:problem_with_comments) }
+      let(:comment) { problem.reload.comments.first }
  
       before(:each) do
-        delete :destroy_comment, :app_id => problem.app.id, :id => problem.id, :comment_id => comment.id
+        delete :destroy_comment, :app_id => problem.app.id, :id => problem.id, :comment_id => comment.id.to_s
         problem.reload
       end
  
@@ -412,9 +412,9 @@ describe ErrsController do
  
   describe "Bulk Actions" do
     before(:each) do
-      sign_in Factory(:admin)
-      @problem1 = Factory(:err, :problem => Factory(:problem, :resolved => true)).problem
-      @problem2 = Factory(:err, :problem => Factory(:problem, :resolved => false)).problem
+      sign_in Fabricate(:admin)
+      @problem1 = Fabricate(:err, :problem => Fabricate(:problem, :resolved => true)).problem
+      @problem2 = Fabricate(:err, :problem => Fabricate(:problem, :resolved => false)).problem
     end
  
     it "should apply to multiple problems" do
@@ -5,7 +5,7 @@ describe NoticesController do
   context 'notices API' do
     before do
       @xml = Rails.root.join('spec','fixtures','hoptoad_test_notice.xml').read
-      @app = Factory(:app_with_watcher)
+      @app = Fabricate(:app_with_watcher)
       App.stub(:find_by_api_key!).and_return(@app)
       @notice = App.report_error!(@xml)
  
@@ -14,16 +14,16 @@ describe UsersController do
  
   context 'Signed in as a regular user' do
     before do
-      sign_in @user = Factory(:user)
+      sign_in @user = Fabricate(:user)
     end
-    
+
     it "should set a time zone" do
       Time.zone.should.to_s == @user.time_zone
     end
  
     context "GET /users/:other_id/edit" do
       it "redirects to the home page" do
-        get :edit, :id => Factory(:user).id
+        get :edit, :id => Fabricate(:user).id
         response.should redirect_to(root_path)
       end
     end
@@ -47,7 +47,7 @@ describe UsersController do
  
     context "PUT /users/:other_id" do
       it "redirects to the home page" do
-        put :update, :id => Factory(:user).id
+        put :update, :id => Fabricate(:user).id
         response.should redirect_to(root_path)
       end
     end
@@ -73,7 +73,7 @@ describe UsersController do
           put :update, :id => @user.to_param, :user => {:per_page => 555}
           @user.reload.per_page.should == 555
         end
-        
+
         it "should be able to set time_zone option" do
           put :update, :id => @user.to_param, :user => {:time_zone => "Warsaw"}
           @user.reload.time_zone.should == "Warsaw"
@@ -91,14 +91,14 @@ describe UsersController do
  
   context 'Signed in as an admin' do
     before do
-      @user = Factory(:admin)
+      @user = Fabricate(:admin)
       sign_in @user
     end
  
     context "GET /users" do
       it 'paginates all users' do
         @user.update_attribute :per_page, 2
-        users = 3.times { Factory(:user) }
+        users = 3.times { Fabricate(:user) }
         get :index
         assigns(:users).to_a.size.should == 2
       end
@@ -106,7 +106,7 @@ describe UsersController do
  
     context "GET /users/:id" do
       it 'finds the user' do
-        user = Factory(:user)
+        user = Fabricate(:user)
         get :show, :id => user.id
         assigns(:user).should == user
       end
@@ -122,7 +122,7 @@ describe UsersController do
  
     context "GET /users/:id/edit" do
       it 'finds the user' do
-        user = Factory(:user)
+        user = Fabricate(:user)
         get :edit, :id => user.id
         assigns(:user).should == user
       end
@@ -131,7 +131,7 @@ describe UsersController do
     context "POST /users" do
       context "when the create is successful" do
         before do
-          @attrs = {:user => Factory.attributes_for(:user)}
+          @attrs = {:user => Fabricate.attributes_for(:user)}
         end
  
         it "sets a message to display" do
@@ -159,7 +159,7 @@ describe UsersController do
  
       context "when the create is unsuccessful" do
         before do
-          @user = Factory(:user)
+          @user = Fabricate(:user)
           User.should_receive(:new).and_return(@user)
           @user.should_receive(:save).and_return(false)
         end
@@ -174,7 +174,7 @@ describe UsersController do
     context "PUT /users/:id" do
       context "when the update is successful" do
         before do
-          @user = Factory(:user)
+          @user = Fabricate(:user)
         end
  
         it "sets a message to display" do
@@ -196,7 +196,7 @@ describe UsersController do
  
       context "when the update is unsuccessful" do
         before do
-          @user = Factory(:user)
+          @user = Fabricate(:user)
         end
  
         it "renders the edit page" do
@@ -208,7 +208,7 @@ describe UsersController do
  
     context "DELETE /users/:id" do
       before do
-        @user = Factory(:user)
+        @user = Fabricate(:user)
       end
  
       it "destroys the user" do
@@ -0,0 +1,27 @@
+Fabricator(:app) do
+  name { sequence(:app_name){|n| "App ##{n}"} }
+end
+
+Fabricator(:app_with_watcher, :from => :app) do
+  watchers(:count => 1) { |parent, i| Fabricate.build(:watcher, :app => parent) }
+end
+
+Fabricator(:watcher) do
+  app!
+  watcher_type 'email'
+  email   { sequence(:email){|n| "email#{n}@example.com"} }
+end
+
+Fabricator(:user_watcher, :from => :watcher) do
+  user!
+  watcher_type 'user'
+end
+
+Fabricator(:deploy) do
+  app!
+  username      'clyde.frog'
+  repository    'git@github.com/errbit/errbit.git'
+  environment   'production'
+  revision      { ActiveSupport::SecureRandom.hex(10) }
+end
+
@@ -0,0 +1,6 @@
+Fabricator :comment do
+  user!
+  body       'Test comment'
+  err!(:fabricator => :problem)
+end
+
@@ -0,0 +1,27 @@
+Fabricator :err do
+  problem!
+  klass!         { 'FooError' }
+  component     'foo'
+  action        'bar'
+  environment   'production'
+end
+
+Fabricator :notice do
+  err!
+  message             'FooError: Too Much Bar'
+  backtrace           { random_backtrace }
+  server_environment  { {'environment-name' => 'production'} }
+  request             {{ 'component' => 'foo', 'action' => 'bar' }}
+  notifier            {{ 'name' => 'Notifier', 'version' => '1', 'url' => 'http://toad.com' }}
+end
+
+def random_backtrace
+  backtrace = []
+  99.times {|t| backtrace << {
+    'number'  => rand(999),
+    'file'    => "/path/to/file/#{ActiveSupport::SecureRandom.hex(4)}.rb",
+    'method'  => ActiveSupport.methods.shuffle.first
+  }}
+  backtrace
+end
+
@@ -0,0 +1,27 @@
+Fabricator :issue_tracker do
+  app!
+  api_token { sequence :word }
+  project_id { sequence :word }
+  account { sequence :word }
+  username { sequence :word }
+  password { sequence :word }
+end
+
+%w(lighthouse pivotal_labs fogbugz).each do |t|
+  Fabricator "#{t}_tracker".to_sym, :from => :issue_tracker, :class_name => "#{t}_tracker".to_sym
+end
+
+Fabricator :redmine_tracker, :from => :issue_tracker, :class_name => :redmine_tracker do
+  account 'http://redmine.example.com'
+end
+
+Fabricator :mingle_tracker, :from => :issue_tracker, :class_name => :mingle_tracker do
+  account 'https://mingle.example.com'
+  ticket_properties 'card_type = Defect, defect_status = open, priority = essential'
+end
+
+Fabricator :github_issues_tracker, :from => :issue_tracker, :class_name => :github_issues_tracker do
+  project_id 'test_account/test_project'
+  username 'test_username'
+end
+
@@ -0,0 +1,12 @@
+Fabricator(:problem) do
+  app! { Fabricate(:app) }
+  comments { [] }
+end
+
+Fabricator(:problem_with_comments, :from => :problem) do
+  after_create { |parent|
+    3.times do
+      Fabricate(:comment, :err => parent)
+    end
+  }
+end
@@ -0,0 +1,3 @@
+Fabricate.sequence(:name) {|n| "John #{n} Doe"}
+Fabricate.sequence(:word) {|n| "word#{n}"}
+
@@ -0,0 +1,10 @@
+Fabricator :user do
+  name                  'Clyde Frog'
+  email                 { sequence(:user_email) {|n| "user.#{n}@example.com"} }
+  password              'password'
+  password_confirmation 'password'
+end
+
+Fabricator :admin, :from => :user do
+  admin true
+end
@@ -1,6 +0,0 @@
-Factory.sequence(:name) {|n| "John #{n} Doe"}
-Factory.sequence(:word) {|n| "word#{n}"}
-Factory.sequence(:app_name) {|n| "App ##{n}"}
-Factory.sequence(:email) {|n| "email#{n}@example.com"}
-Factory.sequence(:user_email) {|n| "user.#{n}@example.com"}
-
@@ -1,29 +0,0 @@
-Factory.define(:app) do |p|
-  p.name { Factory.next :app_name }
-end
-
-Factory.define(:app_with_watcher, :parent => :app) do |p|
-  p.after_create {|app|
-    Factory(:watcher, :app => app)
-  }
-end
-
-Factory.define(:watcher) do |w|
-  w.association :app
-  w.watcher_type 'email'
-  w.email   { Factory.next :email }
-end
-
-Factory.define(:user_watcher, :parent => :watcher) do |w|
-  w.watcher_type 'user'
-  w.association :user
-end
-
-Factory.define(:deploy) do |d|
-  d.app           {|p| p.association :app}
-  d.username      'clyde.frog'
-  d.repository    'git@github.com/errbit/errbit.git'
-  d.environment   'production'
-  d.revision      ActiveSupport::SecureRandom.hex(10)
-end
-
@@ -1,6 +0,0 @@
-Factory.define :comment do |c|
-  c.user       {|u| u.association :user}
-  c.body       'Test comment'
-  c.err        {|e| e.association :problem}
-end
-
@@ -1,40 +0,0 @@
-Factory.define :problem do |p|
-  p.app            {|a| a.association :app}
-  p.comments      []
-end
-
-Factory.define(:problem_with_comments, :parent => :problem) do |ec|
-  ec.comments     { (1..3).map { Factory(:comment) } }
-end
-
-
-
-Factory.define :err do |e|
-  e.problem        {|p| p.association :problem}
-  e.klass         'FooError'
-  e.component     'foo'
-  e.action        'bar'
-  e.environment   'production'
-end
-
-
-
-Factory.define :notice do |n|
-  n.err                 {|e| e.association :err}
-  n.message             'FooError: Too Much Bar'
-  n.backtrace           { random_backtrace }
-  n.server_environment  'environment-name' => 'production'
-  n.request             {{ 'component' => 'foo', 'action' => 'bar' }}
-  n.notifier            'name' => 'Notifier', 'version' => '1', 'url' => 'http://toad.com'
-end
-
-def random_backtrace
-  backtrace = []
-  99.times {|t| backtrace << {
-    'number'  => rand(999),
-    'file'    => "/path/to/file/#{ActiveSupport::SecureRandom.hex(4)}.rb",
-    'method'  => ActiveSupport.methods.shuffle.first
-  }}
-  backtrace
-end
-
@@ -1,27 +0,0 @@
-Factory.define :issue_tracker do |e|
-  e.api_token { Factory.next :word }
-  e.project_id { Factory.next :word }
-  e.association :app, :factory => :app
-  e.account { Factory.next :word }
-  e.username { Factory.next :word }
-  e.password { Factory.next :word }
-end
-
-%w(lighthouse pivotal_labs fogbugz).each do |t|
-  Factory.define "#{t}_tracker".to_sym, :parent => :issue_tracker, :class => "#{t}_tracker".to_sym do |e|; end
-end
-
-Factory.define :redmine_tracker, :parent => :issue_tracker, :class => :redmine_tracker do |e|
-  e.account 'http://redmine.example.com'
-end
-
-Factory.define :mingle_tracker, :parent => :issue_tracker, :class => :mingle_tracker do |e|
-  e.account 'https://mingle.example.com'
-  e.ticket_properties 'card_type = Defect, defect_status = open, priority = essential'
-end
-
-Factory.define :github_issues_tracker, :parent => :issue_tracker, :class => :github_issues_tracker do |e|
-  e.project_id 'test_account/test_project'
-  e.username 'test_username'
-end
-
@@ -1,10 +0,0 @@
-Factory.define :user do |u|
-  u.name                  'Clyde Frog'
-  u.email                 { Factory.next :user_email }
-  u.password              'password'
-  u.password_confirmation 'password'
-end
-
-Factory.define :admin, :parent => :user do |a|
-  a.admin true
-end
@@ -6,7 +6,7 @@ describe Mailer do
     include EmailSpec::Matchers
  
     before do
-      @notice = Factory(:notice, :message => "class < ActionController::Base")
+      @notice = Fabricate(:notice, :message => "class < ActionController::Base")
       @email = Mailer.err_notification(@notice).deliver
     end
  
@@ -3,21 +3,21 @@ require &#39;spec_helper&#39;
 describe App do
   context 'validations' do
     it 'requires a name' do
-      app = Factory.build(:app, :name => nil)
+      app = Fabricate.build(:app, :name => nil)
       app.should_not be_valid
       app.errors[:name].should include("can't be blank")
     end
  
     it 'requires unique names' do
-      Factory(:app, :name => 'Errbit')
-      app = Factory.build(:app, :name => 'Errbit')
+      Fabricate(:app, :name => 'Errbit')
+      app = Fabricate.build(:app, :name => 'Errbit')
       app.should_not be_valid
       app.errors[:name].should include('is already taken')
     end
  
     it 'requires unique api_keys' do
-      Factory(:app, :api_key => 'APIKEY')
-      app = Factory.build(:app, :api_key => 'APIKEY')
+      Fabricate(:app, :api_key => 'APIKEY')
+      app = Fabricate.build(:app, :api_key => 'APIKEY')
       app.should_not be_valid
       app.errors[:api_key].should include('is already taken')
     end
@@ -26,43 +26,43 @@ describe App do
  
   context 'being created' do
     it 'generates a new api-key' do
-      app = Factory.build(:app)
+      app = Fabricate.build(:app)
       app.api_key.should be_nil
       app.save
       app.api_key.should_not be_nil
     end
  
     it 'generates a correct api-key' do
-      app = Factory(:app)
+      app = Fabricate(:app)
       app.api_key.should match(/^[a-f0-9]{32}$/)
     end
  
     it 'is fine with blank github urls' do
-      app = Factory.build(:app, :github_url => "")
+      app = Fabricate.build(:app, :github_url => "")
       app.save
       app.github_url.should == ""
     end
  
     it 'does not touch https github urls' do
-      app = Factory.build(:app, :github_url => "https://github.com/errbit/errbit")
+      app = Fabricate.build(:app, :github_url => "https://github.com/errbit/errbit")
       app.save
       app.github_url.should == "https://github.com/errbit/errbit"
     end
  
     it 'normalizes http github urls' do
-      app = Factory.build(:app, :github_url => "http://github.com/errbit/errbit")
+      app = Fabricate.build(:app, :github_url => "http://github.com/errbit/errbit")
       app.save
       app.github_url.should == "https://github.com/errbit/errbit"
     end
  
     it 'normalizes public git repo as a github url' do
-      app = Factory.build(:app, :github_url => "https://github.com/errbit/errbit.git")
+      app = Fabricate.build(:app, :github_url => "https://github.com/errbit/errbit.git")
       app.save
       app.github_url.should == "https://github.com/errbit/errbit"
     end
  
     it 'normalizes private git repo as a github url' do
-      app = Factory.build(:app, :github_url => "git@github.com:errbit/errbit.git")
+      app = Fabricate.build(:app, :github_url => "git@github.com:errbit/errbit.git")
       app.save
       app.github_url.should == "https://github.com/errbit/errbit"
     end
@@ -70,28 +70,28 @@ describe App do
  
   context '#github_url_to_file' do
     it 'resolves to full path to file' do
-      app = Factory(:app, :github_url => "https://github.com/errbit/errbit")
+      app = Fabricate(:app, :github_url => "https://github.com/errbit/errbit")
       app.github_url_to_file('/path/to/file').should == "https://github.com/errbit/errbit/blob/master/path/to/file"
     end
   end
  
   context '#github_url?' do
     it 'is true when there is a github_url' do
-      app = Factory(:app, :github_url => "https://github.com/errbit/errbit")
+      app = Fabricate(:app, :github_url => "https://github.com/errbit/errbit")
       app.github_url?.should be_true
     end
  
     it 'is false when no github_url' do
-      app = Factory(:app)
+      app = Fabricate(:app)
       app.github_url?.should be_false
     end
   end
  
   context "notification recipients" do
     it "should send notices to either all users, or the configured watchers" do
-      @app = Factory(:app)
-      3.times { Factory(:user) }
-      5.times { Factory(:watcher, :app => @app) }
+      @app = Fabricate(:app)
+      3.times { Fabricate(:user) }
+      5.times { Fabricate(:watcher, :app => @app) }
       @app.notify_all_users = true
       @app.notification_recipients.size.should == 3
       @app.notify_all_users = false
@@ -102,9 +102,9 @@ describe App do
  
   context "copying attributes from existing app" do
     it "should only copy the necessary fields" do
-      @app, @copy_app = Factory(:app, :name => "app", :github_url => "url"),
-                        Factory(:app, :name => "copy_app", :github_url => "copy url")
-      @copy_watcher = Factory(:watcher, :email => "copywatcher@example.com", :app => @copy_app)
+      @app, @copy_app = Fabricate(:app, :name => "app", :github_url => "url"),
+                        Fabricate(:app, :name => "copy_app", :github_url => "copy url")
+      @copy_watcher = Fabricate(:watcher, :email => "copywatcher@example.com", :app => @copy_app)
       @app.copy_attributes_from(@copy_app.id)
       @app.name.should == "app"
       @app.github_url.should == "copy url"
@@ -115,7 +115,7 @@ describe App do
  
   context '#find_or_create_err!' do
     before do
-      @app = Factory(:app)
+      @app = Fabricate(:app)
       @conditions = {
         :klass        => 'Whoops',
         :component    => 'Foo',
@@ -125,7 +125,7 @@ describe App do
     end
  
     it 'returns the correct err if one already exists' do
-      existing = Factory(:err, @conditions.merge(:problem => Factory(:problem, :app => @app)))
+      existing = Fabricate(:err, @conditions.merge(:problem => Fabricate(:problem, :app => @app)))
       Err.where(@conditions).first.should == existing
       @app.find_or_create_err!(@conditions).should == existing
     end
@@ -146,7 +146,7 @@ describe App do
   context '#report_error!' do
     before do
       @xml = Rails.root.join('spec','fixtures','hoptoad_test_notice.xml').read
-      @app = Factory(:app, :api_key => 'APIKEY')
+      @app = Fabricate(:app, :api_key => 'APIKEY')
       ErrorReport.any_instance.stub(:fingerprint).and_return('fingerprintdigest')
     end
  
@@ -163,7 +163,7 @@ describe App do
         :action       => 'verify',
         :environment  => 'development',
         :fingerprint  => 'fingerprintdigest'
-      }).and_return(err = Factory(:err))
+      }).and_return(err = Fabricate(:err))
       err.notices.stub(:create!)
       @notice = App.report_error!(@xml)
     end
@@ -176,7 +176,7 @@ describe App do
         :action       => 'verify',
         :environment  => 'development',
         :fingerprint  => 'fingerprintdigest'
-      }).and_return(err = Factory(:err, :problem => Factory(:problem, :resolved => true)))
+      }).and_return(err = Fabricate(:err, :problem => Fabricate(:problem, :resolved => true)))
       err.should be_resolved
       @notice = App.report_error!(@xml)
       @notice.err.should == err
@@ -3,7 +3,7 @@ require &#39;spec_helper&#39;
 describe Comment do
   context 'validations' do
     it 'should require a body' do
-      comment = Factory.build(:comment, :body => nil)
+      comment = Fabricate.build(:comment, :body => nil)
       comment.should_not be_valid
       comment.errors[:body].should include("can't be blank")
     end
@@ -4,13 +4,13 @@ describe Deploy do
  
   context 'validations' do
     it 'requires a username' do
-      deploy = Factory.build(:deploy, :username => nil)
+      deploy = Fabricate.build(:deploy, :username => nil)
       deploy.should_not be_valid
       deploy.errors[:username].should include("can't be blank")
     end
  
     it 'requires an environment' do
-      deploy = Factory.build(:deploy, :environment => nil)
+      deploy = Fabricate.build(:deploy, :environment => nil)
       deploy.should_not be_valid
       deploy.errors[:environment].should include("can't be blank")
     end
@@ -20,24 +20,24 @@ describe Deploy do
     it 'should send an email notification' do
       Mailer.should_receive(:deploy_notification).
         and_return(mock('email', :deliver => true))
-      Factory(:deploy, :app => Factory(:app_with_watcher, :notify_on_deploys => true))
+      Fabricate(:deploy, :app => Fabricate(:app_with_watcher, :notify_on_deploys => true))
     end
  
     context 'when the app has resolve_errs_on_deploy set to false' do
       it 'should not resolve the apps errs' do
-        app = Factory(:app, :resolve_errs_on_deploy => false)
-        @problems = 3.times.map{Factory(:err, :problem => Factory(:problem, :resolved => false, :app => app))}
-        Factory(:deploy, :app => app)
+        app = Fabricate(:app, :resolve_errs_on_deploy => false)
+        @problems = 3.times.map{Fabricate(:err, :problem => Fabricate(:problem, :resolved => false, :app => app))}
+        Fabricate(:deploy, :app => app)
         app.reload.problems.none?{|problem| problem.resolved?}.should == true
       end
     end
  
     context 'when the app has resolve_errs_on_deploy set to true' do
       it 'should resolve the apps errs that were in the same environment' do
-        app = Factory(:app, :resolve_errs_on_deploy => true)
-        @prod_errs = 3.times.map{Factory(:problem, :resolved => false, :app => app, :environment => 'production')}
-        @staging_errs = 3.times.map{Factory(:problem, :resolved => false, :app => app, :environment => 'staging')}
-        Factory(:deploy, :app => app, :environment => 'production')
+        app = Fabricate(:app, :resolve_errs_on_deploy => true)
+        @prod_errs = 3.times.map{Fabricate(:problem, :resolved => false, :app => app, :environment => 'production')}
+        @staging_errs = 3.times.map{Fabricate(:problem, :resolved => false, :app => app, :environment => 'staging')}
+        Fabricate(:deploy, :app => app, :environment => 'production')
         @prod_errs.all?{|problem| problem.reload.resolved?}.should == true
         @staging_errs.all?{|problem| problem.reload.resolved?}.should == false
       end
@@ -46,7 +46,7 @@ describe Deploy do
     context 'when the app has deploy notifications set to false' do
       it 'should not send an email notification' do
         Mailer.should_not_receive(:deploy_notification)
-        Factory(:deploy, :app => Factory(:app_with_watcher, :notify_on_deploys => false))
+        Fabricate(:deploy, :app => Fabricate(:app_with_watcher, :notify_on_deploys => false))
       end
     end
   end
@@ -4,13 +4,13 @@ describe Err do
  
   context 'validations' do
     it 'requires a klass' do
-      err = Factory.build(:err, :klass => nil)
+      err = Fabricate.build(:err, :klass => nil)
       err.should_not be_valid
       err.errors[:klass].should include("can't be blank")
     end
  
     it 'requires an environment' do
-      err = Factory.build(:err, :environment => nil)
+      err = Fabricate.build(:err, :environment => nil)
       err.should_not be_valid
       err.errors[:environment].should include("can't be blank")
     end
@@ -2,8 +2,8 @@ require &#39;spec_helper&#39;
  
 describe FogbugzTracker do
   it "should create an issue on Fogbugz with problem params, and set issue link for problem" do
-    notice = Factory :notice
-    tracker = Factory :fogbugz_tracker, :app => notice.app
+    notice = Fabricate :notice
+    tracker = Fabricate :fogbugz_tracker, :app => notice.app
     problem = notice.problem
  
     number = 123
@@ -2,8 +2,8 @@ require &#39;spec_helper&#39;
  
 describe GithubIssuesTracker do
   it "should create an issue on Github Issues with problem params, and set issue link for problem" do
-    notice = Factory :notice
-    tracker = Factory :github_issues_tracker, :app => notice.app
+    notice = Fabricate :notice
+    tracker = Fabricate :github_issues_tracker, :app => notice.app
     problem = notice.problem
  
     number = 5
@@ -2,8 +2,8 @@ require &#39;spec_helper&#39;
  
 describe LighthouseTracker do
   it "should create an issue on Lighthouse with problem params, and set issue link for problem" do
-    notice = Factory :notice
-    tracker = Factory :lighthouse_tracker, :app => notice.app
+    notice = Fabricate :notice
+    tracker = Fabricate :lighthouse_tracker, :app => notice.app
     problem = notice.problem
  
     number = 5
@@ -2,8 +2,8 @@ require &#39;spec_helper&#39;
  
 describe MingleTracker do
   it "should create an issue on Mingle with problem params, and set issue link for problem" do
-    notice = Factory :notice
-    tracker = Factory :mingle_tracker, :app => notice.app
+    notice = Fabricate :notice
+    tracker = Fabricate :mingle_tracker, :app => notice.app
     problem = notice.problem
  
     number = 5
@@ -2,8 +2,8 @@ require &#39;spec_helper&#39;
  
 describe PivotalLabsTracker do
   it "should create an issue on Pivotal Tracker with problem params, and set issue link for problem" do
-    notice = Factory :notice
-    tracker = Factory :pivotal_labs_tracker, :app => notice.app, :project_id => 10
+    notice = Fabricate :notice
+    tracker = Fabricate :pivotal_labs_tracker, :app => notice.app, :project_id => 10
     problem = notice.problem
  
     story_id = 5
@@ -2,8 +2,8 @@ require &#39;spec_helper&#39;
  
 describe RedmineTracker do
   it "should create an issue on Redmine with problem params, and set issue link for problem" do
-    notice = Factory(:notice)
-    tracker = Factory(:redmine_tracker, :app => notice.app, :project_id => 10)
+    notice = Fabricate(:notice)
+    tracker = Fabricate(:redmine_tracker, :app => notice.app, :project_id => 10)
     problem = notice.problem
     number = 5
     @issue_link = "#{tracker.account}/issues/#{number}.xml?project_id=#{tracker.project_id}"
@@ -24,7 +24,7 @@ describe RedmineTracker do
   end
  
   it "should generate a url where a file with line number can be viewed" do
-    t = Factory(:redmine_tracker, :account => 'http://redmine.example.com', :project_id => "errbit")
+    t = Fabricate(:redmine_tracker, :account => 'http://redmine.example.com', :project_id => "errbit")
     t.url_to_file("/example/file").should ==
       'http://redmine.example.com/projects/errbit/repository/annotate/example/file'
     t.url_to_file("/example/file", 25).should ==
@@ -32,7 +32,7 @@ describe RedmineTracker do
   end
  
   it "should use the alt_project_id to generate a file/linenumber url, if given" do
-    t = Factory(:redmine_tracker, :account => 'http://redmine.example.com',
+    t = Fabricate(:redmine_tracker, :account => 'http://redmine.example.com',
                                   :project_id => "errbit",
                                   :alt_project_id => "actual_project")
     t.url_to_file("/example/file", 25).should ==
@@ -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
 require 'spec_helper'
  
 describe Problem do
+  describe "Fabrication" do
+    context "Fabricate(:problem)" do
+      it 'should be valid' do
+        Fabricate.build(:problem).should be_valid
+      end
+      it 'should have no comment' do
+        lambda do
+          Fabricate(:problem)
+        end.should_not change(Comment, :count)
+      end
+    end
+
+    context "Fabricate(:problem_with_comments)" do
+      it 'should be valid' do
+        Fabricate.build(:problem_with_comments).should be_valid
+      end
+      it 'should have 3 comments' do
+        lambda do
+          Fabricate(:problem_with_comments)
+        end.should change(Comment, :count).by(3)
+      end
+    end
+  end
   context '#last_notice_at' do
     it "returns the created_at timestamp of the latest notice" do
-      err = Factory(:err)
+      err = Fabricate(:err)
       problem = err.problem
       problem.should_not be_nil
  
       problem.last_notice_at.should be_nil
  
-      notice1 = Factory(:notice, :err => err)
+      notice1 = Fabricate(:notice, :err => err)
       problem.last_notice_at.should == notice1.created_at
  
-      notice2 = Factory(:notice, :err => err)
+      notice2 = Fabricate(:notice, :err => err)
       problem.last_notice_at.should == notice2.created_at
     end
   end
@@ -20,10 +43,10 @@ describe Problem do
  
   context '#message' do
     it "adding a notice caches its message" do
-      err = Factory(:err)
+      err = Fabricate(:err)
       problem = err.problem
       lambda {
-        Factory(:notice, :err => err, :message => 'ERR 1')
+        Fabricate(:notice, :err => err, :message => 'ERR 1')
       }.should change(problem, :message).from(nil).to('ERR 1')
     end
   end
@@ -32,9 +55,9 @@ describe Problem do
   context 'being created' do
     context 'when the app has err notifications set to false' do
       it 'should not send an email notification' do
-        app = Factory(:app_with_watcher, :notify_on_errs => false)
+        app = Fabricate(:app_with_watcher, :notify_on_errs => false)
         Mailer.should_not_receive(:err_notification)
-        Factory(:problem, :app => app)
+        Fabricate(:problem, :app => app)
       end
     end
   end
@@ -48,7 +71,7 @@ describe Problem do
     end
  
     it "should be able to be resolved" do
-      problem = Factory(:problem)
+      problem = Fabricate(:problem)
       problem.should_not be_resolved
       problem.resolve!
       problem.reload.should be_resolved
@@ -58,14 +81,14 @@ describe Problem do
  
   context "resolve!" do
     it "marks the problem as resolved" do
-      problem = Factory(:problem)
+      problem = Fabricate(:problem)
       problem.should_not be_resolved
       problem.resolve!
       problem.should be_resolved
     end
  
     it "should throw an err if it's not successful" do
-      problem = Factory(:problem)
+      problem = Fabricate(:problem)
       problem.should_not be_resolved
       problem.stub!(:valid?).and_return(false)
       problem.should_not be_valid
@@ -78,8 +101,8 @@ describe Problem do
  
   context ".merge!" do
     it "collects the Errs from several problems into one and deletes the other problems" do
-      problem1 = Factory(:err).problem
-      problem2 = Factory(:err).problem
+      problem1 = Fabricate(:err).problem
+      problem2 = Fabricate(:err).problem
       problem1.errs.length.should == 1
       problem2.errs.length.should == 1
  
@@ -93,8 +116,8 @@ describe Problem do
  
   context "#unmerge!" do
     it "creates a separate problem for each err" do
-      problem1 = Factory(:notice).problem
-      problem2 = Factory(:notice).problem
+      problem1 = Fabricate(:notice).problem
+      problem2 = Fabricate(:notice).problem
       merged_problem = Problem.merge!(problem1, problem2)
       merged_problem.errs.length.should == 2
  
@@ -103,7 +126,7 @@ describe Problem do
     end
  
     it "runs smoothly for problem without errs" do
-      expect { Factory(:problem).unmerge! }.not_to raise_error
+      expect { Fabricate(:problem).unmerge! }.not_to raise_error
     end
   end
  
@@ -111,8 +134,8 @@ describe Problem do
   context "Scopes" do
     context "resolved" do
       it 'only finds resolved Problems' do
-        resolved = Factory(:problem, :resolved => true)
-        unresolved = Factory(:problem, :resolved => false)
+        resolved = Fabricate(:problem, :resolved => true)
+        unresolved = Fabricate(:problem, :resolved => false)
         Problem.resolved.all.should include(resolved)
         Problem.resolved.all.should_not include(unresolved)
       end
@@ -120,8 +143,8 @@ describe Problem do
  
     context "unresolved" do
       it 'only finds unresolved Problems' do
-        resolved = Factory(:problem, :resolved => true)
-        unresolved = Factory(:problem, :resolved => false)
+        resolved = Fabricate(:problem, :resolved => true)
+        unresolved = Fabricate(:problem, :resolved => false)
         Problem.unresolved.all.should_not include(resolved)
         Problem.unresolved.all.should include(unresolved)
       end
@@ -131,9 +154,9 @@ describe Problem do
  
   context "notice counter cache" do
     before do
-      @app = Factory(:app)
-      @problem = Factory(:problem, :app => @app)
-      @err = Factory(:err, :problem => @problem)
+      @app = Fabricate(:app)
+      @problem = Fabricate(:problem, :app => @app)
+      @err = Fabricate(:err, :problem => @problem)
     end
  
     it "#notices_count returns 0 by default" do
@@ -142,12 +165,12 @@ describe Problem do
  
     it "adding a notice increases #notices_count by 1" do
       lambda {
-        Factory(:notice, :err => @err, :message => 'ERR 1')
+        Fabricate(:notice, :err => @err, :message => 'ERR 1')
       }.should change(@problem, :notices_count).from(0).to(1)
     end
  
     it "removing a notice decreases #notices_count by 1" do
-      notice1 = Factory(:notice, :err => @err, :message => 'ERR 1')
+      notice1 = Fabricate(:notice, :err => @err, :message => 'ERR 1')
       lambda {
         @err.notices.first.destroy
         @problem.reload
@@ -157,19 +180,18 @@ describe Problem do
  
  
   context "#app_name" do
-    before do
-      @app = Factory(:app)
-    end
+    let!(:app) { Fabricate(:app) }
+    let!(:problem) { Fabricate(:problem, :app => app) }
+
+    before { app.reload }
  
     it "is set when a problem is created" do
-      problem = Factory(:problem, :app => @app)
-      assert_equal @app.name, problem.app_name
+      assert_equal app.name, problem.app_name
     end
  
     it "is updated when an app is updated" do
-      problem = Factory(:problem, :app => @app)
       lambda {
-        @app.update_attributes!(:name => "Bar App")
+        app.update_attributes!(:name => "Bar App")
         problem.reload
       }.should change(problem, :app_name).to("Bar App")
     end
@@ -178,21 +200,21 @@ describe Problem do
  
   context "#last_deploy_at" do
     before do
-      @app = Factory(:app)
+      @app = Fabricate(:app)
       @last_deploy = 10.days.ago.localtime.round(0)
-      deploy = Factory(:deploy, :app => @app, :created_at => @last_deploy, :environment => "production")
+      deploy = Fabricate(:deploy, :app => @app, :created_at => @last_deploy, :environment => "production")
     end
  
     it "is set when a problem is created" do
-      problem = Factory(:problem, :app => @app, :environment => "production")
+      problem = Fabricate(:problem, :app => @app, :environment => "production")
       assert_equal @last_deploy, problem.last_deploy_at
     end
  
     it "is updated when a deploy is created" do
-      problem = Factory(:problem, :app => @app, :environment => "production")
+      problem = Fabricate(:problem, :app => @app, :environment => "production")
       next_deploy = 5.minutes.ago.localtime.round(0)
       lambda {
-        @deploy = Factory(:deploy, :app => @app, :created_at => next_deploy)
+        @deploy = Fabricate(:deploy, :app => @app, :created_at => next_deploy)
         problem.reload
       }.should change(problem, :last_deploy_at).from(@last_deploy).to(next_deploy)
     end
@@ -200,9 +222,9 @@ describe Problem do
  
   context "notice messages cache" do
     before do
-      @app = Factory(:app)
-      @problem = Factory(:problem, :app => @app)
-      @err = Factory(:err, :problem => @problem)
+      @app = Fabricate(:app)
+      @problem = Fabricate(:problem, :app => @app)
+      @err = Fabricate(:err, :problem => @problem)
     end
  
     it "#messages should be empty by default" do
@@ -211,12 +233,12 @@ describe Problem do
  
     it "adding a notice adds a string to #messages" do
       lambda {
-        Factory(:notice, :err => @err, :message => 'ERR 1')
+        Fabricate(:notice, :err => @err, :message => 'ERR 1')
       }.should change(@problem, :messages).from({}).to({Digest::MD5.hexdigest('ERR 1') => {'value' => 'ERR 1', 'count' => 1}})
     end
  
     it "removing a notice removes string from #messages" do
-      notice1 = Factory(:notice, :err => @err, :message => 'ERR 1')
+      notice1 = Fabricate(:notice, :err => @err, :message => 'ERR 1')
       lambda {
         @err.notices.first.destroy
         @problem.reload
@@ -226,9 +248,9 @@ describe Problem do
  
   context "notice hosts cache" do
     before do
-      @app = Factory(:app)
-      @problem = Factory(:problem, :app => @app)
-      @err = Factory(:err, :problem => @problem)
+      @app = Fabricate(:app)
+      @problem = Fabricate(:problem, :app => @app)
+      @err = Fabricate(:err, :problem => @problem)
     end
  
     it "#hosts should be empty by default" do
@@ -237,12 +259,12 @@ describe Problem do
  
     it "adding a notice adds a string to #hosts" do
       lambda {
-        Factory(:notice, :err => @err, :request => {'url' => "http://example.com/resource/12"})
+        Fabricate(:notice, :err => @err, :request => {'url' => "http://example.com/resource/12"})
       }.should change(@problem, :hosts).from({}).to({Digest::MD5.hexdigest('example.com') => {'value' => 'example.com', 'count' => 1}})
     end
  
     it "removing a notice removes string from #hosts" do
-      notice1 = Factory(:notice, :err => @err, :request => {'url' => "http://example.com/resource/12"})
+      notice1 = Fabricate(:notice, :err => @err, :request => {'url' => "http://example.com/resource/12"})
       lambda {
         @err.notices.first.destroy
         @problem.reload
@@ -252,9 +274,9 @@ describe Problem do
  
   context "notice user_agents cache" do
     before do
-      @app = Factory(:app)
-      @problem = Factory(:problem, :app => @app)
-      @err = Factory(:err, :problem => @problem)
+      @app = Fabricate(:app)
+      @problem = Fabricate(:problem, :app => @app)
+      @err = Fabricate(:err, :problem => @problem)
     end
  
     it "#user_agents should be empty by default" do
@@ -263,12 +285,12 @@ describe Problem do
  
     it "adding a notice adds a string to #user_agents" do
       lambda {
-        Factory(:notice, :err => @err, :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'}})
+        Fabricate(:notice, :err => @err, :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'}})
       }.should change(@problem, :user_agents).from({}).to({Digest::MD5.hexdigest('Chrome 10.0.648.204') => {'value' => 'Chrome 10.0.648.204', 'count' => 1}})
     end
  
     it "removing a notice removes string from #user_agents" do
-      notice1 = Factory(:notice, :err => @err, :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'}})
+      notice1 = Fabricate(:notice, :err => @err, :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'}})
       lambda {
         @err.notices.first.destroy
         @problem.reload
@@ -278,8 +300,8 @@ describe Problem do
  
   context "comment counter cache" do
     before do
-      @app = Factory(:app)
-      @problem = Factory(:problem, :app => @app)
+      @app = Fabricate(:app)
+      @problem = Fabricate(:problem, :app => @app)
     end
  
     it "#comments_count returns 0 by default" do
@@ -288,12 +310,12 @@ describe Problem do
  
     it "adding a comment increases #comments_count by 1" do
       lambda {
-        Factory(:comment, :err => @problem)
+        Fabricate(:comment, :err => @problem)
       }.should change(@problem, :comments_count).from(0).to(1)
     end
  
     it "removing a comment decreases #comments_count by 1" do
-      comment1 = Factory(:comment, :err => @problem)
+      comment1 = Fabricate(:comment, :err => @problem)
       lambda {
         @problem.reload.comments.first.destroy
         @problem.reload
@@ -4,7 +4,7 @@ describe User do
  
   context 'validations' do
     it 'require that a name is present' do
-      user = Factory.build(:user, :name => nil)
+      user = Fabricate.build(:user, :name => nil)
       user.should_not be_valid
       user.errors[:name].should include("can't be blank")
     end
@@ -13,26 +13,26 @@ describe User do
   context 'Watchers' do
  
     it 'has many watchers' do
-      user = Factory(:user)
-      watcher = Factory(:user_watcher, :user => user)
+      user = Fabricate(:user)
+      watcher = Fabricate(:user_watcher, :user => user)
       user.watchers.should_not be_empty
       user.watchers.should include(watcher)
     end
  
     it "destroys any related watchers when it is destroyed" do
-      user = Factory(:user)
-      app  = Factory(:app)
-      watcher = Factory(:user_watcher, :app => app, :user => user)
+      user = Fabricate(:user)
+      app  = Fabricate(:app)
+      watcher = Fabricate(:user_watcher, :app => app, :user => user)
       user.watchers.should_not be_empty
       user.destroy
       app.reload.watchers.should_not include(watcher)
     end
  
     it "has many apps through watchers" do
-      user = Factory(:user)
-      watched_app  = Factory(:app)
-      unwatched_app = Factory(:app)
-      watcher = Factory(:user_watcher, :app => watched_app, :user => user)
+      user = Fabricate(:user)
+      watched_app  = Fabricate(:app)
+      unwatched_app = Fabricate(:app)
+      watcher = Fabricate(:user_watcher, :app => watched_app, :user => user)
       user.apps.all.should include(watched_app)
       user.apps.all.should_not include(unwatched_app)
     end
@@ -4,7 +4,7 @@ describe Watcher do
  
   context 'validations' do
     it 'requires an email address or an associated user' do
-      watcher = Factory.build(:watcher, :email => nil, :user => nil)
+      watcher = Fabricate.build(:watcher, :email => nil, :user => nil)
       watcher.should_not be_valid
       watcher.errors[:base].should include("You must specify either a user or an email address")
  
@@ -14,7 +14,7 @@ describe Watcher do
       watcher.email = nil
       watcher.should_not be_valid
  
-      watcher.user = Factory(:user)
+      watcher.user = Fabricate(:user)
       watcher.watcher_type = 'user'
       watcher.should be_valid
     end
@@ -22,13 +22,13 @@ describe Watcher do
  
   context 'address' do
     it "returns the user's email address if there is a user" do
-      user = Factory(:user, :email => 'foo@bar.com')
-      watcher = Factory(:user_watcher, :user => user)
+      user = Fabricate(:user, :email => 'foo@bar.com')
+      watcher = Fabricate(:user_watcher, :user => user)
       watcher.address.should == 'foo@bar.com'
     end
  
     it "returns the email if there is no user" do
-      watcher = Factory(:watcher, :email => 'widgets@acme.com')
+      watcher = Fabricate(:watcher, :email => 'widgets@acme.com')
       watcher.address.should == 'widgets@acme.com'
     end
   end
@@ -10,6 +10,10 @@ require &#39;webmock/rspec&#39;
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
  
+Fabrication.configure do |config|
+  fabricator_dir = "spec/fabricators"
+end
+
 RSpec.configure do |config|
   config.mock_with :rspec
   config.include Devise::TestHelpers, :type => :controller
@@ -45,7 +45,7 @@ def  it_requires_admin_privileges(options = {})
   context 'when signed in as a regular user' do
     before do
       sign_out :user
-      sign_in Factory(:user)
+      sign_in Fabricate(:user)
     end
  
     options[:for].each do |action, method|
@@ -2,9 +2,9 @@ require &#39;spec_helper&#39;
  
 describe "apps/index.html.haml" do
   before do
-    app = Factory(:app, :deploys => [Factory(:deploy, :revision => "123456789abcdef")])
+    app = Fabricate(:app, :deploys => [Fabricate(:deploy, :revision => "123456789abcdef")])
     assign :apps, [app]
-    controller.stub(:current_user) { Factory(:user) }
+    controller.stub(:current_user) { Fabricate(:user) }
   end
  
   describe "deploy column" do
@@ -2,15 +2,15 @@ require &#39;spec_helper&#39;
  
 describe "errs/show.html.haml" do
   before do
-    err = Factory(:err)
+    err = Fabricate(:err)
     problem = err.problem
-    comment = Factory(:comment)
+    comment = Fabricate(:comment)
     assign :problem, problem
     assign :comment, comment
     assign :app, problem.app
     assign :notices, err.notices.page(1).per(1)
     assign :notice, err.notices.first
-    controller.stub(:current_user) { Factory(:user) }
+    controller.stub(:current_user) { Fabricate(:user) }
   end
  
   describe "content_for :action_bar" do
@@ -46,7 +46,7 @@ describe &quot;errs/show.html.haml&quot; do
     end
  
     it 'should display comments and new comment form when no issue tracker' do
-      problem = Factory(:problem_with_comments)
+      problem = Fabricate(:problem_with_comments)
       assign :problem, problem
       assign :app, problem.app
       render
@@ -63,14 +63,15 @@ describe &quot;errs/show.html.haml&quot; do
       end
  
       it 'should not display the comments section' do
-        problem = Factory(:problem)
+        problem = Fabricate(:problem)
         with_issue_tracker(problem)
         render
         view.instance_variable_get(:@_content_for)[:comments].should be_blank
       end
  
       it 'should display existing comments' do
-        problem = Factory(:problem_with_comments)
+        problem = Fabricate(:problem_with_comments)
+        problem.reload
         with_issue_tracker(problem)
         render
         comments_section = String.new(view.instance_variable_get(:@_content_for)[:comments])
@@ -3,7 +3,7 @@ require &#39;spec_helper&#39;
 describe "notices/_backtrace.html.haml" do
   describe 'missing file in backtrace' do
     before do
-      @notice = Factory(:notice, :backtrace => [{
+      @notice = Fabricate(:notice, :backtrace => [{
         'number'  => rand(999),
         'file'    => nil,
         'method'  => ActiveSupport.methods.shuffle.first
...	...	@@ -31,8 +31,7 @@ gem 'ri_cal'
31	31	group :development, :test do
32	32	gem 'rspec-rails', '~> 2.6'
33	33	gem 'webmock', :require => false
34		- gem 'factory_girl', '~> 1.3.3'
35		- gem 'factory_girl_rails', '~> 1.0.1'
	34	+ gem 'fabrication'
36	35	unless ENV['TRAVIS']
37	36	gem 'ruby-debug', :platform => :mri_18
38	37	gem 'ruby-debug19', :platform => :mri_19, :require => 'ruby-debug'
...	...
...	...	@@ -55,10 +55,7 @@ GEM
55	55	rspec (~> 2.0)
56	56	erubis (2.6.6)
57	57	abstract (>= 1.0.0)
58		- factory_girl (1.3.3)
59		- factory_girl_rails (1.0.1)
60		- factory_girl (~> 1.3)
61		- railties (>= 3.0.0)
	58	+ fabrication (1.2.0)
62	59	faraday (0.7.4)
63	60	addressable (~> 2.2.6)
64	61	multipart-post (~> 1.1.0)
...	...	@@ -219,8 +216,7 @@ DEPENDENCIES
219	216	database_cleaner (~> 0.6.0)
220	217	devise (~> 1.4.0)
221	218	email_spec
222		- factory_girl (~> 1.3.3)
223		- factory_girl_rails (~> 1.0.1)
	219	+ fabrication
224	220	haml
225	221	hoptoad_notifier (~> 2.4)
226	222	htmlentities (~> 4.3.0)
...	...
...	...	@@ -116,7 +116,9 @@ class Problem
116	116	self.last_deploy_at = if (last_deploy = app.deploys.where(:environment => self.environment).last)
117	117	last_deploy.created_at
118	118	end
119		- self.save if persisted?
	119	+ collection.update({'_id' => self.id},
	120	+ {'$set' => {'app_name' => self.app_name,
	121	+ 'last_deploy_at' => self.last_deploy_at}})
120	122	end
121	123	end
122	124
...	...
...	...	@@ -45,6 +45,7 @@ module Errbit
45	45	g.orm :mongoid
46	46	g.template_engine :haml
47	47	g.test_framework :rspec, :fixture => false
	48	+ g.fixture_replacement :fabrication
48	49	end
49	50
50	51	# IssueTracker subclasses use inheritance, so preloading models provides querying consistency in dev mode.
...	...
...	...	@@ -10,8 +10,8 @@ describe AppsController do
10	10	describe "GET /apps" do
11	11	context 'when logged in as an admin' do
12	12	it 'finds all apps' do
13		- sign_in Factory(:admin)
14		- 3.times { Factory(:app) }
	13	+ sign_in Fabricate(:admin)
	14	+ 3.times { Fabricate(:app) }
15	15	apps = App.all
16	16	get :index
17	17	assigns(:apps).should == apps
...	...	@@ -20,12 +20,12 @@ describe AppsController do
20	20
21	21	context 'when logged in as a regular user' do
22	22	it 'finds apps the user is watching' do
23		- sign_in(user = Factory(:user))
24		- unwatched_app = Factory(:app)
25		- watched_app1 = Factory(:app)
26		- watched_app2 = Factory(:app)
27		- Factory(:user_watcher, :user => user, :app => watched_app1)
28		- Factory(:user_watcher, :user => user, :app => watched_app2)
	23	+ sign_in(user = Fabricate(:user))
	24	+ unwatched_app = Fabricate(:app)
	25	+ watched_app1 = Fabricate(:app)
	26	+ watched_app2 = Fabricate(:app)
	27	+ Fabricate(:user_watcher, :user => user, :app => watched_app1)
	28	+ Fabricate(:user_watcher, :user => user, :app => watched_app2)
29	29	get :index
30	30	assigns(:apps).should include(watched_app1, watched_app2)
31	31	assigns(:apps).should_not include(unwatched_app)
...	...	@@ -36,10 +36,10 @@ describe AppsController do
36	36	describe "GET /apps/:id" do
37	37	context 'logged in as an admin' do
38	38	before(:each) do
39		- @user = Factory(:admin)
	39	+ @user = Fabricate(:admin)
40	40	sign_in @user
41		- @app = Factory(:app)
42		- @problem = Factory(:notice, :err => Factory(:err, :problem => Factory(:problem, :app => @app))).problem
	41	+ @app = Fabricate(:app)
	42	+ @problem = Fabricate(:notice, :err => Fabricate(:err, :problem => Fabricate(:problem, :app => @app))).problem
43	43	end
44	44
45	45	it 'finds the app' do
...	...	@@ -48,7 +48,7 @@ describe AppsController do
48	48	end
49	49
50	50	it "should not raise errors for app with err without notices" do
51		- Factory(:err, :problem => Factory(:problem, :app => @app))
	51	+ Fabricate(:err, :problem => Fabricate(:problem, :app => @app))
52	52	lambda { get :show, :id => @app.id }.should_not raise_error
53	53	end
54	54
...	...	@@ -60,7 +60,7 @@ describe AppsController do
60	60
61	61	context "pagination" do
62	62	before(:each) do
63		- 35.times { Factory(:err, :problem => Factory(:problem, :app => @app)) }
	63	+ 35.times { Fabricate(:err, :problem => Fabricate(:problem, :app => @app)) }
64	64	end
65	65
66	66	it "should have default per_page value for user" do
...	...	@@ -77,8 +77,8 @@ describe AppsController do
77	77
78	78	context 'with resolved errors' do
79	79	before(:each) do
80		- resolved_problem = Factory(:problem, :app => @app)
81		- Factory(:notice, :err => Factory(:err, :problem => resolved_problem))
	80	+ resolved_problem = Fabricate(:problem, :app => @app)
	81	+ Fabricate(:notice, :err => Fabricate(:err, :problem => resolved_problem))
82	82	resolved_problem.resolve!
83	83	end
84	84
...	...	@@ -101,7 +101,7 @@ describe AppsController do
101	101	before(:each) do
102	102	environments = ['production', 'test', 'development', 'staging']
103	103	20.times do \|i\|
104		- Factory.create(:problem, :app => @app, :environment => environments[i % environments.length])
	104	+ Fabricate(:problem, :app => @app, :environment => environments[i % environments.length])
105	105	end
106	106	end
107	107
...	...	@@ -144,17 +144,17 @@ describe AppsController do
144	144
145	145	context 'logged in as a user' do
146	146	it 'finds the app if the user is watching it' do
147		- user = Factory(:user)
148		- app = Factory(:app)
149		- watcher = Factory(:user_watcher, :app => app, :user => user)
	147	+ user = Fabricate(:user)
	148	+ app = Fabricate(:app)
	149	+ watcher = Fabricate(:user_watcher, :app => app, :user => user)
150	150	sign_in user
151	151	get :show, :id => app.id
152	152	assigns(:app).should == app
153	153	end
154	154
155	155	it 'does not find the app if the user is not watching it' do
156		- sign_in Factory(:user)
157		- app = Factory(:app)
	156	+ sign_in Fabricate(:user)
	157	+ app = Fabricate(:app)
158	158	lambda {
159	159	get :show, :id => app.id
160	160	}.should raise_error(Mongoid::Errors::DocumentNotFound)
...	...	@@ -164,7 +164,7 @@ describe AppsController do
164	164
165	165	context 'logged in as an admin' do
166	166	before do
167		- sign_in Factory(:admin)
	167	+ sign_in Fabricate(:admin)
168	168	end
169	169
170	170	describe "GET /apps/new" do
...	...	@@ -176,7 +176,7 @@ describe AppsController do
176	176	end
177	177
178	178	it "should copy attributes from an existing app" do
179		- @app = Factory(:app, :name => "do not copy",
	179	+ @app = Fabricate(:app, :name => "do not copy",
180	180	:github_url => "github.com/test/example")
181	181	get :new, :copy_attributes_from => @app.id
182	182	assigns(:app).should be_a(App)
...	...	@@ -188,7 +188,7 @@ describe AppsController do
188	188
189	189	describe "GET /apps/:id/edit" do
190	190	it 'finds the correct app' do
191		- app = Factory(:app)
	191	+ app = Fabricate(:app)
192	192	get :edit, :id => app.id
193	193	assigns(:app).should == app
194	194	end
...	...	@@ -196,7 +196,7 @@ describe AppsController do
196	196
197	197	describe "POST /apps" do
198	198	before do
199		- @app = Factory(:app)
	199	+ @app = Fabricate(:app)
200	200	App.stub(:new).and_return(@app)
201	201	end
202	202
...	...	@@ -219,7 +219,7 @@ describe AppsController do
219	219
220	220	describe "PUT /apps/:id" do
221	221	before do
222		- @app = Factory(:app)
	222	+ @app = Fabricate(:app)
223	223	end
224	224
225	225	context "when the update is successful" do
...	...	@@ -257,7 +257,7 @@ describe AppsController do
257	257	end
258	258	context "failed parsing of CSV" do
259	259	it "should set the default value" do
260		- @app = Factory(:app, :email_at_notices => [1, 2, 3, 4])
	260	+ @app = Fabricate(:app, :email_at_notices => [1, 2, 3, 4])
261	261	put :update, :id => @app.id, :app => { :email_at_notices => 'asdf, -1,0,foobar,gd00,0,abc' }
262	262	@app.reload
263	263	@app.email_at_notices.should == Errbit::Config.email_at_notices
...	...	@@ -320,7 +320,7 @@ describe AppsController do
320	320
321	321	describe "DELETE /apps/:id" do
322	322	before do
323		- @app = Factory(:app)
	323	+ @app = Fabricate(:app)
324	324	App.stub(:find).with(@app.id).and_return(@app)
325	325	end
326	326
...	...
...	...	@@ -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
...	...
...	...	@@ -7,17 +7,17 @@ describe ErrsController do
7	7	},
8	8	:params => {:app_id => 'dummyid', :id => 'dummyid'}
9	9
10		- let(:app) { Factory(:app) }
11		- let(:err) { Factory(:err, :problem => Factory(:problem, :app => app, :environment => "production")) }
	10	+ let(:app) { Fabricate(:app) }
	11	+ let(:err) { Fabricate(:err, :problem => Fabricate(:problem, :app => app, :environment => "production")) }
12	12
13	13
14	14	describe "GET /errs" do
15	15	render_views
16	16	context 'when logged in as an admin' do
17	17	before(:each) do
18		- @user = Factory(:admin)
	18	+ @user = Fabricate(:admin)
19	19	sign_in @user
20		- @problem = Factory(:notice, :err => Factory(:err, :problem => Factory(:problem, :app => app, :environment => "production"))).problem
	20	+ @problem = Fabricate(:notice, :err => Fabricate(:err, :problem => Fabricate(:problem, :app => app, :environment => "production"))).problem
21	21	end
22	22
23	23	it "should successfully list errs" do
...	...	@@ -34,7 +34,7 @@ describe ErrsController do
34	34
35	35	context "pagination" do
36	36	before(:each) do
37		- 35.times { Factory :err }
	37	+ 35.times { Fabricate :err }
38	38	end
39	39
40	40	it "should have default per_page value for user" do
...	...	@@ -53,7 +53,7 @@ describe ErrsController do
53	53	before(:each) do
54	54	environments = ['production', 'test', 'development', 'staging']
55	55	20.times do \|i\|
56		- Factory(:problem, :environment => environments[i % environments.length])
	56	+ Fabricate(:problem, :environment => environments[i % environments.length])
57	57	end
58	58	end
59	59
...	...	@@ -96,10 +96,10 @@ describe ErrsController do
96	96
97	97	context 'when logged in as a user' do
98	98	it 'gets a paginated list of unresolved errs for the users apps' do
99		- sign_in(user = Factory(:user))
100		- unwatched_err = Factory(:err)
101		- watched_unresolved_err = Factory(:err, :problem => Factory(:problem, :app => Factory(:user_watcher, :user => user).app, :resolved => false))
102		- watched_resolved_err = Factory(:err, :problem => Factory(:problem, :app => Factory(:user_watcher, :user => user).app, :resolved => true))
	99	+ sign_in(user = Fabricate(:user))
	100	+ unwatched_err = Fabricate(:err)
	101	+ watched_unresolved_err = Fabricate(:err, :problem => Fabricate(:problem, :app => Fabricate(:user_watcher, :user => user).app, :resolved => false))
	102	+ watched_resolved_err = Fabricate(:err, :problem => Fabricate(:problem, :app => Fabricate(:user_watcher, :user => user).app, :resolved => true))
103	103	get :index
104	104	assigns(:problems).should include(watched_unresolved_err.problem)
105	105	assigns(:problems).should_not include(unwatched_err.problem, watched_resolved_err.problem)
...	...	@@ -110,10 +110,10 @@ describe ErrsController do
110	110	describe "GET /errs/all" do
111	111	context 'when logged in as an admin' do
112	112	it "gets a paginated list of all errs" do
113		- sign_in Factory(:admin)
	113	+ sign_in Fabricate(:admin)
114	114	errs = Kaminari.paginate_array((1..30).to_a)
115		- 3.times { errs << Factory(:err).problem }
116		- 3.times { errs << Factory(:err, :problem => Factory(:problem, :resolved => true)).problem }
	115	+ 3.times { errs << Fabricate(:err).problem }
	116	+ 3.times { errs << Fabricate(:err, :problem => Fabricate(:problem, :resolved => true)).problem }
117	117	Problem.should_receive(:ordered).and_return(
118	118	mock('proxy', :page => mock('other_proxy', :per => errs))
119	119	)
...	...	@@ -124,10 +124,10 @@ describe ErrsController do
124	124
125	125	context 'when logged in as a user' do
126	126	it 'gets a paginated list of all errs for the users apps' do
127		- sign_in(user = Factory(:user))
128		- unwatched_err = Factory(:problem)
129		- watched_unresolved_err = Factory(:problem, :app => Factory(:user_watcher, :user => user).app, :resolved => false)
130		- watched_resolved_err = Factory(:problem, :app => Factory(:user_watcher, :user => user).app, :resolved => true)
	127	+ sign_in(user = Fabricate(:user))
	128	+ unwatched_err = Fabricate(:problem)
	129	+ watched_unresolved_err = Fabricate(:problem, :app => Fabricate(:user_watcher, :user => user).app, :resolved => false)
	130	+ watched_resolved_err = Fabricate(:problem, :app => Fabricate(:user_watcher, :user => user).app, :resolved => true)
131	131	get :all
132	132	assigns(:problems).should include(watched_resolved_err, watched_unresolved_err)
133	133	assigns(:problems).should_not include(unwatched_err)
...	...	@@ -139,12 +139,12 @@ describe ErrsController do
139	139	render_views
140	140
141	141	before do
142		- 3.times { Factory(:notice, :err => err)}
	142	+ 3.times { Fabricate(:notice, :err => err)}
143	143	end
144	144
145	145	context 'when logged in as an admin' do
146	146	before do
147		- sign_in Factory(:admin)
	147	+ sign_in Fabricate(:admin)
148	148	end
149	149
150	150	it "finds the app" do
...	...	@@ -166,23 +166,23 @@ describe ErrsController do
166	166	let(:button_matcher) { match(/create issue/) }
167	167
168	168	it "should not exist for err's app without issue tracker" do
169		- err = Factory :err
	169	+ err = Fabricate :err
170	170	get :show, :app_id => err.app.id, :id => err.problem.id
171	171
172	172	response.body.should_not button_matcher
173	173	end
174	174
175	175	it "should exist for err's app with issue tracker" do
176		- tracker = Factory(:lighthouse_tracker)
177		- err = Factory(:err, :problem => Factory(:problem, :app => tracker.app))
	176	+ tracker = Fabricate(:lighthouse_tracker)
	177	+ err = Fabricate(:err, :problem => Fabricate(:problem, :app => tracker.app))
178	178	get :show, :app_id => err.app.id, :id => err.problem.id
179	179
180	180	response.body.should button_matcher
181	181	end
182	182
183	183	it "should not exist for err with issue_link" do
184		- tracker = Factory(:lighthouse_tracker)
185		- err = Factory(:err, :problem => Factory(:problem, :app => tracker.app, :issue_link => "http://some.host"))
	184	+ tracker = Fabricate(:lighthouse_tracker)
	185	+ err = Fabricate(:err, :problem => Fabricate(:problem, :app => tracker.app, :issue_link => "http://some.host"))
186	186	get :show, :app_id => err.app.id, :id => err.problem.id
187	187
188	188	response.body.should_not button_matcher
...	...	@@ -192,11 +192,11 @@ describe ErrsController do
192	192
193	193	context 'when logged in as a user' do
194	194	before do
195		- sign_in(@user = Factory(:user))
196		- @unwatched_err = Factory(:err)
197		- @watched_app = Factory(:app)
198		- @watcher = Factory(:user_watcher, :user => @user, :app => @watched_app)
199		- @watched_err = Factory(:err, :problem => Factory(:problem, :app => @watched_app))
	195	+ sign_in(@user = Fabricate(:user))
	196	+ @unwatched_err = Fabricate(:err)
	197	+ @watched_app = Fabricate(:app)
	198	+ @watcher = Fabricate(:user_watcher, :user => @user, :app => @watched_app)
	199	+ @watched_err = Fabricate(:err, :problem => Fabricate(:problem, :app => @watched_app))
200	200	end
201	201
202	202	it 'finds the err if the user is watching the app' do
...	...	@@ -214,9 +214,9 @@ describe ErrsController do
214	214
215	215	describe "PUT /apps/:app_id/errs/:id/resolve" do
216	216	before do
217		- sign_in Factory(:admin)
	217	+ sign_in Fabricate(:admin)
218	218
219		- @problem = Factory(:err)
	219	+ @problem = Fabricate(:err)
220	220	App.stub(:find).with(@problem.app.id).and_return(@problem.app)
221	221	@problem.app.problems.stub(:find).and_return(@problem.problem)
222	222	@problem.problem.stub(:resolve!)
...	...	@@ -256,13 +256,13 @@ describe ErrsController do
256	256	render_views
257	257
258	258	before(:each) do
259		- sign_in Factory(:admin)
	259	+ sign_in Fabricate(:admin)
260	260	end
261	261
262	262	context "successful issue creation" do
263	263	context "lighthouseapp tracker" do
264		- let(:notice) { Factory :notice }
265		- let(:tracker) { Factory :lighthouse_tracker, :app => notice.app }
	264	+ let(:notice) { Fabricate :notice }
	265	+ let(:tracker) { Fabricate :lighthouse_tracker, :app => notice.app }
266	266	let(:problem) { notice.problem }
267	267
268	268	before(:each) do
...	...	@@ -283,7 +283,7 @@ describe ErrsController do
283	283	end
284	284
285	285	context "absent issue tracker" do
286		- let(:problem) { Factory :problem }
	286	+ let(:problem) { Fabricate :problem }
287	287
288	288	before(:each) do
289	289	post :create_issue, :app_id => problem.app.id, :id => problem.id
...	...	@@ -300,8 +300,8 @@ describe ErrsController do
300	300
301	301	context "error during request to a tracker" do
302	302	context "lighthouseapp tracker" do
303		- let(:tracker) { Factory :lighthouse_tracker }
304		- let(:err) { Factory(:err, :problem => Factory(:problem, :app => tracker.app)) }
	303	+ let(:tracker) { Fabricate :lighthouse_tracker }
	304	+ let(:err) { Fabricate(:err, :problem => Fabricate(:problem, :app => tracker.app)) }
305	305
306	306	before(:each) do
307	307	stub_request(:post, "http://#{tracker.account}.lighthouseapp.com/projects/#{tracker.project_id}/tickets.xml").to_return(:status => 500)
...	...	@@ -322,11 +322,11 @@ describe ErrsController do
322	322
323	323	describe "DELETE /apps/:app_id/errs/:id/unlink_issue" do
324	324	before(:each) do
325		- sign_in Factory(:admin)
	325	+ sign_in Fabricate(:admin)
326	326	end
327	327
328	328	context "err with issue" do
329		- let(:err) { Factory(:err, :problem => Factory(:problem, :issue_link => "http://some.host")) }
	329	+ let(:err) { Fabricate(:err, :problem => Fabricate(:problem, :issue_link => "http://some.host")) }
330	330
331	331	before(:each) do
332	332	delete :unlink_issue, :app_id => err.app.id, :id => err.problem.id
...	...	@@ -343,7 +343,7 @@ describe ErrsController do
343	343	end
344	344
345	345	context "err without issue" do
346		- let(:err) { Factory :err }
	346	+ let(:err) { Fabricate :err }
347	347
348	348	before(:each) do
349	349	delete :unlink_issue, :app_id => err.app.id, :id => err.problem.id
...	...	@@ -361,12 +361,12 @@ describe ErrsController do
361	361	render_views
362	362
363	363	before(:each) do
364		- sign_in Factory(:admin)
	364	+ sign_in Fabricate(:admin)
365	365	end
366	366
367	367	context "successful comment creation" do
368		- let(:problem) { Factory(:problem) }
369		- let(:user) { Factory(:user) }
	368	+ let(:problem) { Fabricate(:problem) }
	369	+ let(:user) { Fabricate(:user) }
370	370
371	371	before(:each) do
372	372	post :create_comment, :app_id => problem.app.id, :id => problem.id,
...	...	@@ -388,15 +388,15 @@ describe ErrsController do
388	388	render_views
389	389
390	390	before(:each) do
391		- sign_in Factory(:admin)
	391	+ sign_in Fabricate(:admin)
392	392	end
393	393
394	394	context "successful comment deletion" do
395		- let(:problem) { Factory(:problem_with_comments) }
396		- let(:comment) { problem.comments.first }
	395	+ let(:problem) { Fabricate(:problem_with_comments) }
	396	+ let(:comment) { problem.reload.comments.first }
397	397
398	398	before(:each) do
399		- delete :destroy_comment, :app_id => problem.app.id, :id => problem.id, :comment_id => comment.id
	399	+ delete :destroy_comment, :app_id => problem.app.id, :id => problem.id, :comment_id => comment.id.to_s
400	400	problem.reload
401	401	end
402	402
...	...	@@ -412,9 +412,9 @@ describe ErrsController do
412	412
413	413	describe "Bulk Actions" do
414	414	before(:each) do
415		- sign_in Factory(:admin)
416		- @problem1 = Factory(:err, :problem => Factory(:problem, :resolved => true)).problem
417		- @problem2 = Factory(:err, :problem => Factory(:problem, :resolved => false)).problem
	415	+ sign_in Fabricate(:admin)
	416	+ @problem1 = Fabricate(:err, :problem => Fabricate(:problem, :resolved => true)).problem
	417	+ @problem2 = Fabricate(:err, :problem => Fabricate(:problem, :resolved => false)).problem
418	418	end
419	419
420	420	it "should apply to multiple problems" do
...	...
...	...	@@ -5,7 +5,7 @@ describe NoticesController do
5	5	context 'notices API' do
6	6	before do
7	7	@xml = Rails.root.join('spec','fixtures','hoptoad_test_notice.xml').read
8		- @app = Factory(:app_with_watcher)
	8	+ @app = Fabricate(:app_with_watcher)
9	9	App.stub(:find_by_api_key!).and_return(@app)
10	10	@notice = App.report_error!(@xml)
11	11
...	...
...	...	@@ -14,16 +14,16 @@ describe UsersController do
14	14
15	15	context 'Signed in as a regular user' do
16	16	before do
17		- sign_in @user = Factory(:user)
	17	+ sign_in @user = Fabricate(:user)
18	18	end
19		-
	19	+
20	20	it "should set a time zone" do
21	21	Time.zone.should.to_s == @user.time_zone
22	22	end
23	23
24	24	context "GET /users/:other_id/edit" do
25	25	it "redirects to the home page" do
26		- get :edit, :id => Factory(:user).id
	26	+ get :edit, :id => Fabricate(:user).id
27	27	response.should redirect_to(root_path)
28	28	end
29	29	end
...	...	@@ -47,7 +47,7 @@ describe UsersController do
47	47
48	48	context "PUT /users/:other_id" do
49	49	it "redirects to the home page" do
50		- put :update, :id => Factory(:user).id
	50	+ put :update, :id => Fabricate(:user).id
51	51	response.should redirect_to(root_path)
52	52	end
53	53	end
...	...	@@ -73,7 +73,7 @@ describe UsersController do
73	73	put :update, :id => @user.to_param, :user => {:per_page => 555}
74	74	@user.reload.per_page.should == 555
75	75	end
76		-
	76	+
77	77	it "should be able to set time_zone option" do
78	78	put :update, :id => @user.to_param, :user => {:time_zone => "Warsaw"}
79	79	@user.reload.time_zone.should == "Warsaw"
...	...	@@ -91,14 +91,14 @@ describe UsersController do
91	91
92	92	context 'Signed in as an admin' do
93	93	before do
94		- @user = Factory(:admin)
	94	+ @user = Fabricate(:admin)
95	95	sign_in @user
96	96	end
97	97
98	98	context "GET /users" do
99	99	it 'paginates all users' do
100	100	@user.update_attribute :per_page, 2
101		- users = 3.times { Factory(:user) }
	101	+ users = 3.times { Fabricate(:user) }
102	102	get :index
103	103	assigns(:users).to_a.size.should == 2
104	104	end
...	...	@@ -106,7 +106,7 @@ describe UsersController do
106	106
107	107	context "GET /users/:id" do
108	108	it 'finds the user' do
109		- user = Factory(:user)
	109	+ user = Fabricate(:user)
110	110	get :show, :id => user.id
111	111	assigns(:user).should == user
112	112	end
...	...	@@ -122,7 +122,7 @@ describe UsersController do
122	122
123	123	context "GET /users/:id/edit" do
124	124	it 'finds the user' do
125		- user = Factory(:user)
	125	+ user = Fabricate(:user)
126	126	get :edit, :id => user.id
127	127	assigns(:user).should == user
128	128	end
...	...	@@ -131,7 +131,7 @@ describe UsersController do
131	131	context "POST /users" do
132	132	context "when the create is successful" do
133	133	before do
134		- @attrs = {:user => Factory.attributes_for(:user)}
	134	+ @attrs = {:user => Fabricate.attributes_for(:user)}
135	135	end
136	136
137	137	it "sets a message to display" do
...	...	@@ -159,7 +159,7 @@ describe UsersController do
159	159
160	160	context "when the create is unsuccessful" do
161	161	before do
162		- @user = Factory(:user)
	162	+ @user = Fabricate(:user)
163	163	User.should_receive(:new).and_return(@user)
164	164	@user.should_receive(:save).and_return(false)
165	165	end
...	...	@@ -174,7 +174,7 @@ describe UsersController do
174	174	context "PUT /users/:id" do
175	175	context "when the update is successful" do
176	176	before do
177		- @user = Factory(:user)
	177	+ @user = Fabricate(:user)
178	178	end
179	179
180	180	it "sets a message to display" do
...	...	@@ -196,7 +196,7 @@ describe UsersController do
196	196
197	197	context "when the update is unsuccessful" do
198	198	before do
199		- @user = Factory(:user)
	199	+ @user = Fabricate(:user)
200	200	end
201	201
202	202	it "renders the edit page" do
...	...	@@ -208,7 +208,7 @@ describe UsersController do
208	208
209	209	context "DELETE /users/:id" do
210	210	before do
211		- @user = Factory(:user)
	211	+ @user = Fabricate(:user)
212	212	end
213	213
214	214	it "destroys the user" do
...	...
...	...	@@ -0,0 +1,27 @@
	1	+Fabricator(:app) do
	2	+ name { sequence(:app_name){\|n\| "App ##{n}"} }
	3	+end
	4	+
	5	+Fabricator(:app_with_watcher, :from => :app) do
	6	+ watchers(:count => 1) { \|parent, i\| Fabricate.build(:watcher, :app => parent) }
	7	+end
	8	+
	9	+Fabricator(:watcher) do
	10	+ app!
	11	+ watcher_type 'email'
	12	+ email { sequence(:email){\|n\| "email#{n}@example.com"} }
	13	+end
	14	+
	15	+Fabricator(:user_watcher, :from => :watcher) do
	16	+ user!
	17	+ watcher_type 'user'
	18	+end
	19	+
	20	+Fabricator(:deploy) do
	21	+ app!
	22	+ username 'clyde.frog'
	23	+ repository 'git@github.com/errbit/errbit.git'
	24	+ environment 'production'
	25	+ revision { ActiveSupport::SecureRandom.hex(10) }
	26	+end
	27	+
...	...