github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-28 13:51:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Use response.parsed_body in specs (#9615)

Browse Source 
Most of it was autofixed with rubocop-discourse 2.1.1.
This commit is contained in:
Jarek Radosz
2020-05-07 17:04:12 +02:00
committed by GitHub
parent 69ef0da4c2
commit 781e3f5e10
70 changed files with 705 additions and 714 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
spec/requests/session_controller_spec.rb
View File

@ -60,8 +60,8 @@ RSpec.describe SessionController do
it 'returns information' do
get "/session/email-login/#{email_token.token}.json"
expect(JSON.parse(response.body)["can_login"]).to eq(true)
expect(JSON.parse(response.body)["second_factor_required"]).to eq(nil)
expect(response.parsed_body["can_login"]).to eq(true)
expect(response.parsed_body["second_factor_required"]).to eq(nil)
# Does not log in the user
expect(session[:current_user_id]).to be_nil
@ -90,7 +90,7 @@ RSpec.describe SessionController do
it "includes that information in the response" do
get "/session/email-login/#{email_token.token}.json"
response_body_parsed = JSON.parse(response.body)
response_body_parsed = response.parsed_body
expect(response_body_parsed["can_login"]).to eq(true)
expect(response_body_parsed["second_factor_required"]).to eq(true)
expect(response_body_parsed["backup_codes_enabled"]).to eq(true)
@ -103,7 +103,7 @@ RSpec.describe SessionController do
it "includes that information in the response" do
get "/session/email-login/#{email_token.token}.json"
response_body_parsed = JSON.parse(response.body)
response_body_parsed = response.parsed_body
expect(response_body_parsed["can_login"]).to eq(true)
expect(response_body_parsed["security_key_required"]).to eq(true)
expect(response_body_parsed["second_factor_required"]).to eq(nil)
@ -148,7 +148,7 @@ RSpec.describe SessionController do
post "/session/email-login/adasdad.json"
expect(response.status).to eq(200)
expect(JSON.parse(response.body)["error"]).to eq(
expect(response.parsed_body["error"]).to eq(
I18n.t('email_login.invalid_token')
)
end
@ -161,7 +161,7 @@ RSpec.describe SessionController do
expect(response.status).to eq(200)
expect(JSON.parse(response.body)["error"]).to eq(
expect(response.parsed_body["error"]).to eq(
I18n.t('email_login.invalid_token')
)
end
@ -172,7 +172,7 @@ RSpec.describe SessionController do
it 'returns success' do
post "/session/email-login/#{email_token.token}.json"
expect(JSON.parse(response.body)["success"]).to eq("OK")
expect(response.parsed_body["success"]).to eq("OK")
expect(session[:current_user_id]).to eq(user.id)
end
@ -201,7 +201,7 @@ RSpec.describe SessionController do
expect(response.status).to eq(200)
expect(JSON.parse(response.body)["error"]).to eq(I18n.t("login.not_approved"))
expect(response.parsed_body["error"]).to eq(I18n.t("login.not_approved"))
expect(session[:current_user_id]).to eq(nil)
end
@ -221,7 +221,7 @@ RSpec.describe SessionController do
expect(response.status).to eq(200)
expect(JSON.parse(response.body)["error"]).to eq(
expect(response.parsed_body["error"]).to eq(
I18n.t("login.admin_not_allowed_from_ip_address", username: user.username)
)
expect(session[:current_user_id]).to eq(nil)
@ -245,7 +245,7 @@ RSpec.describe SessionController do
expect(response.status).to eq(200)
expect(JSON.parse(response.body)["error"]).to eq(
expect(response.parsed_body["error"]).to eq(
I18n.t("login.not_allowed_from_ip_address", username: user.username)
)
expect(session[:current_user_id]).to eq(nil)
@ -270,7 +270,7 @@ RSpec.describe SessionController do
expect(response.status).to eq(200)
expect(JSON.parse(response.body)["error"]).to eq(
expect(response.parsed_body["error"]).to eq(
I18n.t("login.suspended", date: I18n.l(user.suspended_till, format: :date_only)
))
expect(session[:current_user_id]).to eq(nil)
@ -290,7 +290,7 @@ RSpec.describe SessionController do
expect(response.status).to eq(200)
expect(JSON.parse(response.body)["error"]).to eq(
expect(response.parsed_body["error"]).to eq(
I18n.t("login.invalid_second_factor_code")
)
expect(session[:current_user_id]).to eq(nil)
@ -304,7 +304,7 @@ RSpec.describe SessionController do
}
expect(response.status).to eq(200)
expect(JSON.parse(response.body)["error"]).to eq(
expect(response.parsed_body["error"]).to eq(
I18n.t("login.invalid_second_factor_code")
)
expect(session[:current_user_id]).to eq(nil)
@ -320,7 +320,7 @@ RSpec.describe SessionController do
second_factor_method: UserSecondFactor.methods[:totp]
}
expect(JSON.parse(response.body)["success"]).to eq("OK")
expect(response.parsed_body["success"]).to eq("OK")
expect(session[:current_user_id]).to eq(user.id)
end
end
@ -331,7 +331,7 @@ RSpec.describe SessionController do
second_factor_method: UserSecondFactor.methods[:backup_codes]
}
expect(JSON.parse(response.body)["success"]).to eq("OK")
expect(response.parsed_body["success"]).to eq("OK")
expect(session[:current_user_id]).to eq(user.id)
end
end
@ -346,7 +346,7 @@ RSpec.describe SessionController do
expect(response.status).to eq(200)
expect(JSON.parse(response.body)["error"]).to eq(
expect(response.parsed_body["error"]).to eq(
I18n.t("login.invalid_second_factor_code")
)
expect(session[:current_user_id]).to eq(nil)
@ -381,7 +381,7 @@ RSpec.describe SessionController do
expect(response.status).to eq(200)
expect(session[:current_user_id]).to eq(nil)
response_body = JSON.parse(response.body)
response_body = response.parsed_body
expect(response_body['error']).to eq(I18n.t(
'login.not_enabled_second_factor_method'
))
@ -402,7 +402,7 @@ RSpec.describe SessionController do
expect(response.status).to eq(200)
expect(session[:current_user_id]).to eq(nil)
response_body = JSON.parse(response.body)
response_body = response.parsed_body
expect(response_body["failed"]).to eq("FAILED")
expect(response_body['error']).to eq(I18n.t(
'webauthn.validation.not_found_error'
@ -447,7 +447,7 @@ RSpec.describe SessionController do
expect(response.status).to eq(200)
expect(session[:current_user_id]).to eq(nil)
response_body = JSON.parse(response.body)
response_body = response.parsed_body
expect(response_body['error']).to eq(I18n.t(
'login.invalid_second_factor_code'
))
@ -461,7 +461,7 @@ RSpec.describe SessionController do
expect(response.status).to eq(200)
expect(session[:current_user_id]).to eq(nil)
response_body = JSON.parse(response.body)
response_body = response.parsed_body
expect(response_body['error']).to eq(I18n.t(
'login.invalid_second_factor_code'
))
@ -491,7 +491,7 @@ RSpec.describe SessionController do
get "/session/#{user.username}/become.json"
expect(response.status).to eq(403)
expect(JSON.parse(response.body)["error_type"]).to eq("invalid_access")
expect(response.parsed_body["error_type"]).to eq("invalid_access")
expect(session[:current_user_id]).to be_blank
end
@ -1226,7 +1226,7 @@ RSpec.describe SessionController do
}
expect(response.status).to eq(200)
expect(::JSON.parse(response.body)['error']).to eq(
expect(response.parsed_body['error']).to eq(
I18n.t("login.incorrect_username_email_or_password")
)
end
@ -1240,7 +1240,7 @@ RSpec.describe SessionController do
}
expect(response.status).to eq(200)
expect(::JSON.parse(response.body)['error']).to eq(
expect(response.parsed_body['error']).to eq(
I18n.t("login.incorrect_username_email_or_password")
)
end
@ -1258,7 +1258,7 @@ RSpec.describe SessionController do
}
expect(response.status).to eq(200)
expect(JSON.parse(response.body)['error']).to eq(I18n.t('login.suspended_with_reason',
expect(response.parsed_body['error']).to eq(I18n.t('login.suspended_with_reason',
date: I18n.l(user.suspended_till, format: :date_only),
reason: Rack::Utils.escape_html(user.suspend_reason)
))
@ -1275,7 +1275,7 @@ RSpec.describe SessionController do
}
expect(response.status).to eq(200)
expect(JSON.parse(response.body)['error']).to eq(I18n.t('login.not_activated'))
expect(response.parsed_body['error']).to eq(I18n.t('login.not_activated'))
end
end
@ -1342,7 +1342,7 @@ RSpec.describe SessionController do
expect(response.status).to eq(200)
expect(session[:current_user_id]).to eq(nil)
response_body = JSON.parse(response.body)
response_body = response.parsed_body
expect(response_body["failed"]).to eq("FAILED")
expect(response_body['error']).to eq(I18n.t(
'login.invalid_security_key'
@ -1366,7 +1366,7 @@ RSpec.describe SessionController do
expect(response.status).to eq(200)
expect(session[:current_user_id]).to eq(nil)
response_body = JSON.parse(response.body)
response_body = response.parsed_body
expect(response_body["failed"]).to eq("FAILED")
expect(response_body['error']).to eq(I18n.t(
'webauthn.validation.not_found_error'
@ -1407,9 +1407,9 @@ RSpec.describe SessionController do
expect(response.status).to eq(200)
expect(session[:current_user_id]).to eq(nil)
response_body = JSON.parse(response.body)
response_body = response.parsed_body
expect(response_body["failed"]).to eq("FAILED")
expect(JSON.parse(response.body)['error']).to eq(I18n.t(
expect(response.parsed_body['error']).to eq(I18n.t(
'login.not_enabled_second_factor_method'
))
end
@ -1428,7 +1428,7 @@ RSpec.describe SessionController do
}
expect(response.status).to eq(200)
expect(JSON.parse(response.body)['error']).to eq(I18n.t(
expect(response.parsed_body['error']).to eq(I18n.t(
'login.invalid_second_factor_method'
))
end
@ -1445,7 +1445,7 @@ RSpec.describe SessionController do
}
expect(response.status).to eq(200)
expect(JSON.parse(response.body)['error']).to eq(I18n.t(
expect(response.parsed_body['error']).to eq(I18n.t(
'login.invalid_second_factor_code'
))
end
@ -1460,7 +1460,7 @@ RSpec.describe SessionController do
}
expect(response.status).to eq(200)
expect(JSON.parse(response.body)['error']).to eq(I18n.t(
expect(response.parsed_body['error']).to eq(I18n.t(
'login.invalid_second_factor_code'
))
end
@ -1553,7 +1553,7 @@ RSpec.describe SessionController do
login: username, password: 'myawesomepassword'
}
expect(response.status).to eq(200)
expect(::JSON.parse(response.body)['error']).not_to be_present
expect(response.parsed_body['error']).not_to be_present
end
it "strips spaces from the email" do
@ -1561,7 +1561,7 @@ RSpec.describe SessionController do
login: email, password: 'myawesomepassword'
}
expect(response.status).to eq(200)
expect(::JSON.parse(response.body)['error']).not_to be_present
expect(response.parsed_body['error']).not_to be_present
end
end
@ -1585,7 +1585,7 @@ RSpec.describe SessionController do
it "shows the 'not approved' error message" do
expect(response.status).to eq(200)
expect(JSON.parse(response.body)['error']).to eq(
expect(response.parsed_body['error']).to eq(
I18n.t('login.not_approved')
)
end
@ -1635,7 +1635,7 @@ RSpec.describe SessionController do
}
expect(response.status).to eq(200)
expect(JSON.parse(response.body)['error']).to be_present
expect(response.parsed_body['error']).to be_present
expect(session[:current_user_id]).not_to eq(user.id)
end
@ -1670,7 +1670,7 @@ RSpec.describe SessionController do
it "shows the 'not activated' error message" do
post_login
expect(response.status).to eq(200)
expect(JSON.parse(response.body)['error']).to eq(
expect(response.parsed_body['error']).to eq(
I18n.t 'login.not_activated'
)
end
@ -1681,7 +1681,7 @@ RSpec.describe SessionController do
it "shows the 'not approved' error message" do
post_login
expect(response.status).to eq(200)
expect(JSON.parse(response.body)['error']).to eq(
expect(response.parsed_body['error']).to eq(
I18n.t 'login.not_approved'
)
end
@ -1707,7 +1707,7 @@ RSpec.describe SessionController do
}
expect(response.status).to eq(429)
json = JSON.parse(response.body)
json = response.parsed_body
expect(json["error_type"]).to eq("rate_limit")
end
@ -1732,7 +1732,7 @@ RSpec.describe SessionController do
}
expect(response.status).to eq(429)
json = JSON.parse(response.body)
json = response.parsed_body
expect(json["error_type"]).to eq("rate_limit")
end
end
@ -1936,7 +1936,7 @@ RSpec.describe SessionController do
it "returns the JSON for the user" do
get "/session/current.json"
expect(response.status).to eq(200)
json = ::JSON.parse(response.body)
json = response.parsed_body
expect(json['current_user']).to be_present
expect(json['current_user']['id']).to eq(user.id)
end