From 05c31f19099af7c981702590ed980632782c17bd Mon Sep 17 00:00:00 2001 From: Rimian Perkins Date: Wed, 17 May 2017 10:30:28 +1000 Subject: [PATCH] use site setting instead of params for create account --- .../discourse_donations/charges_controller.rb | 2 +- disource-donations | 1 + .../discourse_donations/charges_controller_spec.rb | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-) create mode 120000 disource-donations diff --git a/app/controllers/discourse_donations/charges_controller.rb b/app/controllers/discourse_donations/charges_controller.rb index 8f57c8c..bb93df1 100644 --- a/app/controllers/discourse_donations/charges_controller.rb +++ b/app/controllers/discourse_donations/charges_controller.rb @@ -46,7 +46,7 @@ module DiscourseDonations private def create_account - params[:create_account] == 'true' && SiteSetting.discourse_donations_enable_create_accounts + SiteSetting.discourse_donations_enable_create_accounts end def reward?(payment) diff --git a/disource-donations b/disource-donations new file mode 120000 index 0000000..5f94186 --- /dev/null +++ b/disource-donations @@ -0,0 +1 @@ +disource-donations \ No newline at end of file diff --git a/spec/controllers/discourse_donations/charges_controller_spec.rb b/spec/controllers/discourse_donations/charges_controller_spec.rb index 6f82a93..cea3764 100644 --- a/spec/controllers/discourse_donations/charges_controller_spec.rb +++ b/spec/controllers/discourse_donations/charges_controller_spec.rb @@ -31,7 +31,7 @@ module DiscourseDonations it 'does not expect a username or email if accounts are not being created' do current_user = log_in(:coding_horror) - post :create, { create_account: 'false' } + post :create expect(body['messages']).to include(I18n.t('donations.payment.success')) expect(response).to have_http_status(200) end @@ -49,12 +49,12 @@ module DiscourseDonations it 'does not create user accounts if the user is logged in' do log_in :coding_horror - post :create, { create_account: 'true' } + post :create end end describe 'creating an account' do - let(:params) { { create_account: 'true', email: 'email@example.com', password: 'secret', username: 'mr-pink' } } + let(:params) { { email: 'email@example.com', password: 'secret', username: 'mr-pink' } } before do SiteSetting.stubs(:discourse_donations_enable_create_accounts).returns(true) @@ -68,7 +68,7 @@ module DiscourseDonations end describe 'new user' do - let(:params) { { create_account: 'true', email: 'email@example.com', password: 'secret', username: 'mr-pink' } } + let(:params) { { email: 'email@example.com', password: 'secret', username: 'mr-pink' } } before { SiteSetting.stubs(:discourse_donations_enable_create_accounts).returns(true) } @@ -113,7 +113,7 @@ module DiscourseDonations end describe 'new user' do - let(:params) { { create_account: 'true', email: 'dood@example.com', password: 'secret', name: 'dood', username: 'mr-dood' } } + let(:params) { { email: 'dood@example.com', password: 'secret', name: 'dood', username: 'mr-dood' } } before { SiteSetting.stubs(:discourse_donations_enable_create_accounts).returns(true) }