Review Changes for f4f8a293e7.

spec/requests/users_email_controller_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe UsersEmailController do
 
-  describe '.confirm' do
+  describe '#confirm' do
     it 'errors out for invalid tokens' do
       get "/u/authorize-email/asdfasdf"
 
@@ -62,29 +62,37 @@ describe UsersEmailController do
       end
 
       context 'second factor required' do
-        second_factor_data = "rcyryaqage3jexfj"
-        before do
-          user.user_second_factor = UserSecondFactor.create(user_id: user.id, method: "totp", data: second_factor_data, enabled: true)
-        end
+        let!(:second_factor) { Fabricate(:user_second_factor, user: user) }
 
         it 'requires a second factor token' do
           get "/u/authorize-email/#{user.email_tokens.last.token}"
-          expect(response.body).to include(I18n.t("login.second_factor_title"))
-          expect(response.body).not_to include(I18n.t("login.invalid_second_factor_code"))
+
+          expect(response.status).to eq(200)
+
+          response_body = response.body
+
+          expect(response_body).to include(I18n.t("login.second_factor_title"))
+          expect(response_body).not_to include(I18n.t("login.invalid_second_factor_code"))
         end
 
         it 'adds an error on a second factor attempt' do
           get "/u/authorize-email/#{user.email_tokens.last.token}", params: {
-                second_factor_token: "000000"
-              }
+            second_factor_token: "000000"
+          }
+
+          expect(response.status).to eq(200)
           expect(response.body).to include(I18n.t("login.invalid_second_factor_code"))
         end
 
         it 'confirms with a correct second token' do
           get "/u/authorize-email/#{user.email_tokens.last.token}", params: {
-                second_factor_token: ROTP::TOTP.new(second_factor_data).now
-              }
-          expect(response).to be_success
+            second_factor_token: ROTP::TOTP.new(second_factor.data).now
+          }
+
+          expect(response.status).to eq(200)
+
+          response_body = response.body
+
           expect(response.body).not_to include(I18n.t("login.second_factor_title"))
           expect(response.body).not_to include(I18n.t("login.invalid_second_factor_code"))
         end
@@ -92,17 +100,16 @@ describe UsersEmailController do
     end
   end
 
-  describe '.update' do
+  describe '#update' do
+    let(:user) { Fabricate(:user) }
     let(:new_email) { 'bubblegum@adventuretime.ooo' }
 
     it "requires you to be logged in" do
-      put "/u/asdf/preferences/email.json"
+      put "/u/#{user.username}/preferences/email.json", params: { email: new_email }
       expect(response.status).to eq(403)
     end
 
     context 'when logged in' do
-      let(:user) { Fabricate(:user) }
-
       before do
         sign_in(user)
       end