scottk/chatwoot
1
0
Fork 0
mirror of https://github.com/lingble/chatwoot.git synced 2025-11-02 03:57:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: revert GlobalConfig changes (#3702)

Browse Source 
Priority to GlobalConfig changes are reverted and for the time being, env vars will take precedence if set.

Fixes #3699
This commit is contained in:
Vishnu Narayanan
2022-01-12 08:50:23 +05:30
committed by GitHub
parent f44be0b1e6
commit acba07cf6e
4 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
spec/controllers/api/v1/accounts_controller_spec.rb
View File

@@ -5,11 +5,6 @@ RSpec.describe 'Accounts API', type: :request do
let(:email) { Faker::Internet.email }
let(:user_full_name) { Faker::Name.name_with_middle }
before do
# to clear redis cache
GlobalConfig.clear_cache
end
context 'when posting to accounts with correct parameters' do
let(:account_builder) { double }
let(:account) { create(:account) }
@@ -20,56 +15,62 @@ RSpec.describe 'Accounts API', type: :request do
end
it 'calls account builder' do
GlobalConfigService.load('ENABLE_ACCOUNT_SIGNUP', 'nil')
allow(account_builder).to receive(:perform).and_return([user, account])
with_modified_env ENABLE_ACCOUNT_SIGNUP: 'true' do
allow(account_builder).to receive(:perform).and_return([user, account])
params = { account_name: 'test', email: email, user: nil, user_full_name: user_full_name, password: 'Password1!' }
params = { account_name: 'test', email: email, user: nil, user_full_name: user_full_name, password: 'Password1!' }
post api_v1_accounts_url,
params: params,
as: :json
post api_v1_accounts_url,
params: params,
as: :json
expect(AccountBuilder).to have_received(:new).with(params.except(:password).merge(user_password: params[:password]))
expect(account_builder).to have_received(:perform)
expect(response.headers.keys).to include('access-token', 'token-type', 'client', 'expiry', 'uid')
expect(AccountBuilder).to have_received(:new).with(params.except(:password).merge(user_password: params[:password]))
expect(account_builder).to have_received(:perform)
expect(response.headers.keys).to include('access-token', 'token-type', 'client', 'expiry', 'uid')
end
end
it 'renders error response on invalid params' do
GlobalConfigService.load('ENABLE_ACCOUNT_SIGNUP', 'nil')
allow(account_builder).to receive(:perform).and_return(nil)
with_modified_env ENABLE_ACCOUNT_SIGNUP: 'true' do
allow(account_builder).to receive(:perform).and_return(nil)
params = { account_name: nil, email: nil, user: nil, user_full_name: nil }
params = { account_name: nil, email: nil, user: nil, user_full_name: nil }
post api_v1_accounts_url,
params: params,
as: :json
post api_v1_accounts_url,
params: params,
as: :json
expect(AccountBuilder).to have_received(:new).with(params.merge(user_password: params[:password]))
expect(account_builder).to have_received(:perform)
expect(response).to have_http_status(:forbidden)
expect(response.body).to eq({ message: I18n.t('errors.signup.failed') }.to_json)
expect(AccountBuilder).to have_received(:new).with(params.merge(user_password: params[:password]))
expect(account_builder).to have_received(:perform)
expect(response).to have_http_status(:forbidden)
expect(response.body).to eq({ message: I18n.t('errors.signup.failed') }.to_json)
end
end
end
context 'when ENABLE_ACCOUNT_SIGNUP env variable is set to false' do
it 'responds 404 on requests' do
params = { account_name: 'test', email: email, user_full_name: user_full_name, password: 'Password1!' }
GlobalConfigService.load('ENABLE_ACCOUNT_SIGNUP', 'false')
post api_v1_accounts_url,
params: params,
as: :json
expect(response).to have_http_status(:not_found)
params = { account_name: 'test', email: email, user_full_name: user_full_name }
with_modified_env ENABLE_ACCOUNT_SIGNUP: 'false' do
post api_v1_accounts_url,
params: params,
as: :json
expect(response).to have_http_status(:not_found)
end
end
end
context 'when ENABLE_ACCOUNT_SIGNUP env variable is set to api_only' do
it 'does not respond 404 on requests' do
params = { account_name: 'test', email: email, user_full_name: user_full_name, password: 'Password1!' }
GlobalConfigService.load('ENABLE_ACCOUNT_SIGNUP', 'api_only')
post api_v1_accounts_url,
params: params,
as: :json
expect(response).to have_http_status(:success)
with_modified_env ENABLE_ACCOUNT_SIGNUP: 'api_only' do
post api_v1_accounts_url,
params: params,
as: :json
expect(response).to have_http_status(:success)
end
end
end
end