Add rubocop to our build. (#5004)

spec/controllers/users_controller_spec.rb

@@ -70,7 +70,7 @@ describe UsersController do
 
         it "skips tracking" do
           UserProfileView.expects(:add).never
-          xhr :get, :show, { username: user.username, skip_track_visit: true }
+          xhr :get, :show, username: user.username, skip_track_visit: true
         end
       end
 
@@ -723,7 +723,7 @@ describe UsersController do
       before do
         UsersController.any_instance.stubs(:honeypot_value).returns('abc')
       end
-      let(:create_params) { {name: @user.name, username: @user.username, password: "strongpassword", email: @user.email, password_confirmation: 'wrong'} }
+      let(:create_params) { { name: @user.name, username: @user.username, password: "strongpassword", email: @user.email, password_confirmation: 'wrong' } }
       include_examples 'honeypot fails'
     end
 
@@ -731,14 +731,14 @@ describe UsersController do
       before do
         UsersController.any_instance.stubs(:challenge_value).returns('abc')
       end
-      let(:create_params) { {name: @user.name, username: @user.username, password: "strongpassword", email: @user.email, challenge: 'abc'} }
+      let(:create_params) { { name: @user.name, username: @user.username, password: "strongpassword", email: @user.email, challenge: 'abc' } }
       include_examples 'honeypot fails'
     end
 
     context "when 'invite only' setting is enabled" do
       before { SiteSetting.invite_only = true }
 
-      let(:create_params) {{
+      let(:create_params) { {
         name: @user.name,
         username: @user.username,
         password: 'strongpassword',
@@ -765,22 +765,22 @@ describe UsersController do
     end
 
     context 'when password is blank' do
-      let(:create_params) { {name: @user.name, username: @user.username, password: "", email: @user.email} }
+      let(:create_params) { { name: @user.name, username: @user.username, password: "", email: @user.email } }
       include_examples 'failed signup'
     end
 
     context 'when password is too long' do
-      let(:create_params) { {name: @user.name, username: @user.username, password: "x" * (User.max_password_length + 1), email: @user.email} }
+      let(:create_params) { { name: @user.name, username: @user.username, password: "x" * (User.max_password_length + 1), email: @user.email } }
       include_examples 'failed signup'
     end
 
     context 'when password param is missing' do
-      let(:create_params) { {name: @user.name, username: @user.username, email: @user.email} }
+      let(:create_params) { { name: @user.name, username: @user.username, email: @user.email } }
       include_examples 'failed signup'
     end
 
     context 'with a reserved username' do
-      let(:create_params) { {name: @user.name, username: 'Reserved', email: @user.email, password: "x" * 20} }
+      let(:create_params) { { name: @user.name, username: 'Reserved', email: @user.email, password: "x" * 20 } }
       before { SiteSetting.reserved_usernames = 'a|reserved|b' }
       after { SiteSetting.reserved_usernames = nil }
       include_examples 'failed signup'
@@ -791,7 +791,7 @@ describe UsersController do
 
       let(:create_params) {
         { name: @user.name, username: @user.username,
-          password: "strongpassword", email: @user.email}
+          password: "strongpassword", email: @user.email }
       }
 
       include_examples 'failed signup'
@@ -803,7 +803,7 @@ describe UsersController do
       let!(:optional_field) { Fabricate(:user_field, required: false) }
 
       context "without a value for the fields" do
-        let(:create_params) { {name: @user.name, password: 'watwatwat', username: @user.username, email: @user.email} }
+        let(:create_params) { { name: @user.name, password: 'watwatwat', username: @user.username, email: @user.email } }
         include_examples 'failed signup'
       end
 
@@ -1256,7 +1256,7 @@ describe UsersController do
           put :update,
                 username: user.username,
                 name: 'Jim Tom',
-                custom_fields: {test: :it},
+                custom_fields: { test: :it },
                 muted_usernames: "#{user2.username},#{user3.username}"
 
           expect(response).to be_success
@@ -1265,7 +1265,7 @@ describe UsersController do
 
           expect(user.name).to eq 'Jim Tom'
           expect(user.custom_fields['test']).to eq 'it'
-          expect(user.muted_users.pluck(:username).sort).to eq [user2.username,user3.username].sort
+          expect(user.muted_users.pluck(:username).sort).to eq [user2.username, user3.username].sort
 
           theme = Theme.create(name: "test", user_selectable: true, user_id: -1)
 
@@ -1297,7 +1297,7 @@ describe UsersController do
         context "with user fields" do
           context "an editable field" do
             let!(:user_field) { Fabricate(:user_field) }
-            let!(:optional_field) { Fabricate(:user_field, required: false ) }
+            let!(:optional_field) { Fabricate(:user_field, required: false) }
 
             it "should update the user field" do
               put :update, username: user.username, name: 'Jim Tom', user_fields: { user_field.id.to_s => 'happy' }
@@ -1548,7 +1548,7 @@ describe UsersController do
 
       context 'without an existing email_token' do
         before do
-          user.email_tokens.each {|t| t.destroy}
+          user.email_tokens.each { |t| t.destroy }
           user.reload
         end
 
@@ -1556,7 +1556,7 @@ describe UsersController do
           expect {
             session[SessionController::ACTIVATE_USER_KEY] = user.id
             xhr :post, :send_activation_email, username: user.username
-          }.to change{ user.email_tokens(true).count }.by(1)
+          }.to change { user.email_tokens(true).count }.by(1)
         end
 
         it 'should send an email' do
@@ -1833,11 +1833,11 @@ describe UsersController do
   end
 
   describe '.topic_tracking_state' do
-    let(:user){Fabricate(:user)}
+    let(:user) { Fabricate(:user) }
 
     context 'anon' do
       it "raises an error on anon for topic_tracking_state" do
-        expect{
+        expect {
           xhr :get, :topic_tracking_state, username: user.username, format: :json
         }.to raise_error(Discourse::NotLoggedIn)
       end
@@ -1872,7 +1872,6 @@ describe UsersController do
     end
   end
 
-
   describe ".confirm_admin" do
     it "fails without a valid token" do
       expect {
@@ -1937,28 +1936,27 @@ describe UsersController do
 
   end
 
-
   describe '.update_activation_email' do
 
     context "with a session variable" do
 
       it "raises an error with an invalid session value" do
         session[SessionController::ACTIVATE_USER_KEY] = 1234
-        xhr :put, :update_activation_email, { email: 'updatedemail@example.com' }
+        xhr :put, :update_activation_email, email: 'updatedemail@example.com'
         expect(response).to_not be_success
       end
 
       it "raises an error for an active user" do
         user = Fabricate(:walter_white)
         session[SessionController::ACTIVATE_USER_KEY] = user.id
-        xhr :put, :update_activation_email, { email: 'updatedemail@example.com' }
+        xhr :put, :update_activation_email, email: 'updatedemail@example.com'
         expect(response).to_not be_success
       end
 
       it "raises an error when logged in" do
         moderator = log_in(:moderator)
         session[SessionController::ACTIVATE_USER_KEY] = moderator.id
-        xhr :put, :update_activation_email, { email: 'updatedemail@example.com' }
+        xhr :put, :update_activation_email, email: 'updatedemail@example.com'
         expect(response).to_not be_success
       end
 
@@ -1966,7 +1964,7 @@ describe UsersController do
         active_user = Fabricate(:user)
         user = Fabricate(:inactive_user)
         session[SessionController::ACTIVATE_USER_KEY] = user.id
-        xhr :put, :update_activation_email, { email: active_user.email }
+        xhr :put, :update_activation_email, email: active_user.email
         expect(response).to_not be_success
       end
 
@@ -1975,7 +1973,7 @@ describe UsersController do
         token = user.email_tokens.first
 
         session[SessionController::ACTIVATE_USER_KEY] = user.id
-        xhr :put, :update_activation_email, { email: 'updatedemail@example.com' }
+        xhr :put, :update_activation_email, email: 'updatedemail@example.com'
 
         expect(response).to be_success
 
@@ -1990,51 +1988,41 @@ describe UsersController do
 
     context "with a username and password" do
       it "raises an error with an invalid username" do
-        xhr :put, :update_activation_email, {
-          username: 'eviltrout',
-          password: 'invalid-password',
-          email: 'updatedemail@example.com'
-        }
+        xhr :put, :update_activation_email,           username: 'eviltrout',
+                                                      password: 'invalid-password',
+                                                      email: 'updatedemail@example.com'
         expect(response).to_not be_success
       end
 
       it "raises an error with an invalid password" do
-        xhr :put, :update_activation_email, {
-          username: Fabricate(:inactive_user).username,
-          password: 'invalid-password',
-          email: 'updatedemail@example.com'
-        }
+        xhr :put, :update_activation_email,           username: Fabricate(:inactive_user).username,
+                                                      password: 'invalid-password',
+                                                      email: 'updatedemail@example.com'
         expect(response).to_not be_success
       end
 
       it "raises an error for an active user" do
-        xhr :put, :update_activation_email, {
-          username: Fabricate(:walter_white).username,
-          password: 'letscook',
-          email: 'updatedemail@example.com'
-        }
+        xhr :put, :update_activation_email,           username: Fabricate(:walter_white).username,
+                                                      password: 'letscook',
+                                                      email: 'updatedemail@example.com'
         expect(response).to_not be_success
       end
 
       it "raises an error when logged in" do
         log_in(:moderator)
 
-        xhr :put, :update_activation_email, {
-          username: Fabricate(:inactive_user).username,
-          password: 'qwerqwer123',
-          email: 'updatedemail@example.com'
-        }
+        xhr :put, :update_activation_email,           username: Fabricate(:inactive_user).username,
+                                                      password: 'qwerqwer123',
+                                                      email: 'updatedemail@example.com'
         expect(response).to_not be_success
       end
 
       it "raises an error when the new email is taken" do
         user = Fabricate(:user)
 
-        xhr :put, :update_activation_email, {
-          username: Fabricate(:inactive_user).username,
-          password: 'qwerqwer123',
-          email: user.email
-        }
+        xhr :put, :update_activation_email,           username: Fabricate(:inactive_user).username,
+                                                      password: 'qwerqwer123',
+                                                      email: user.email
 
         expect(response).to_not be_success
       end
@@ -2043,11 +2031,9 @@ describe UsersController do
         user = Fabricate(:inactive_user)
         token = user.email_tokens.first
 
-        xhr :put, :update_activation_email, {
-          username: user.username,
-          password: 'qwerqwer123',
-          email: 'updatedemail@example.com'
-        }
+        xhr :put, :update_activation_email,           username: user.username,
+                                                      password: 'qwerqwer123',
+                                                      email: 'updatedemail@example.com'
 
         expect(response).to be_success