Merge pull request #2316 from mutiny/refactor-where-first

Refactor `where(...).first` to `find_by(...)`

spec/controllers/categories_controller_spec.rb

@@ -57,7 +57,7 @@ describe CategoriesController do
                               }
 
           response.status.should == 200
-          category = Category.where(name: "hello").first
+          category = Category.find_by(name: "hello")
           category.category_groups.map{|g| [g.group_id, g.permission_type]}.sort.should == [
             [Group[:everyone].id, readonly],[Group[:staff].id,create_post]
           ]

spec/controllers/session_controller_spec.rb

@@ -171,7 +171,7 @@ describe SessionController do
 
     context 'when email is confirmed' do
       before do
-        token = user.email_tokens.where(email: user.email).first
+        token = user.email_tokens.find_by(email: user.email)
         EmailToken.confirm(token.token)
       end
 

spec/controllers/uploads_controller_spec.rb

@@ -116,20 +116,20 @@ describe UploadsController do
     it "returns 404 when using external storage" do
       store = stub(internal?: false)
       Discourse.stubs(:store).returns(store)
-      Upload.expects(:where).never
+      Upload.expects(:find_by).never
       get :show, site: "default", id: 1, sha: "1234567890abcdef", extension: "pdf"
       response.response_code.should == 404
     end
 
     it "returns 404 when the upload doens't exist" do
-      Upload.expects(:where).with(id: 2, url: "/uploads/default/2/1234567890abcdef.pdf").returns [nil]
+      Upload.expects(:find_by).with(id: 2, url: "/uploads/default/2/1234567890abcdef.pdf").returns(nil)
       get :show, site: "default", id: 2, sha: "1234567890abcdef", extension: "pdf"
       response.response_code.should == 404
     end
 
     it 'uses send_file' do
       upload = build(:upload)
-      Upload.expects(:where).with(id: 42, url: "/uploads/default/42/66b3ed1503efc936.zip").returns([upload])
+      Upload.expects(:find_by).with(id: 42, url: "/uploads/default/42/66b3ed1503efc936.zip").returns(upload)
 
       controller.stubs(:render)
       controller.expects(:send_file)

spec/controllers/user_badges_controller_spec.rb

@@ -45,7 +45,7 @@ describe UserBadgesController do
       StaffActionLogger.any_instance.expects(:log_badge_grant).once
       xhr :post, :create, badge_id: badge.id, username: user.username
       response.status.should == 200
-      user_badge = UserBadge.where(user: user, badge: badge).first
+      user_badge = UserBadge.find_by(user: user, badge: badge)
       user_badge.should be_present
       user_badge.granted_by.should eq(admin)
     end
@@ -61,7 +61,7 @@ describe UserBadgesController do
       StaffActionLogger.any_instance.expects(:log_badge_grant).never
       xhr :post, :create, badge_id: badge.id, username: user.username, api_key: api_key.key
       response.status.should == 200
-      user_badge = UserBadge.where(user: user, badge: badge).first
+      user_badge = UserBadge.find_by(user: user, badge: badge)
       user_badge.should be_present
       user_badge.granted_by.should eq(Discourse.system_user)
     end
@@ -80,7 +80,7 @@ describe UserBadgesController do
       StaffActionLogger.any_instance.expects(:log_badge_revoke).once
       xhr :delete, :destroy, id: user_badge.id
       response.status.should == 200
-      UserBadge.where(id: user_badge.id).first.should be_nil
+      UserBadge.find_by(id: user_badge.id).should be_nil
     end
   end
 end

spec/controllers/users_controller_spec.rb

@@ -382,7 +382,7 @@ describe UsersController do
       end
 
       it 'should not result in an active account' do
-        User.where(username: @user.username).first.active.should be_false
+        User.find_by(username: @user.username).active.should be_false
       end
     end