mirror of
https://github.com/discourse/discourse-subscriptions.git
synced 2025-03-06 17:49:24 +00:00
empty rewards
This commit is contained in:
parent
b2393cb2aa
commit
c3fe90f4d1
@ -14,9 +14,12 @@ module DiscourseDonations
|
|||||||
response = {}
|
response = {}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
response['rewards'] = []
|
||||||
|
|
||||||
if reward_user?(payment)
|
if reward_user?(payment)
|
||||||
reward = DiscourseDonations::Rewards.new(current_user)
|
reward = DiscourseDonations::Rewards.new(current_user)
|
||||||
reward.add_to_group(SiteSetting.discourse_donations_reward_group) if add_to_group?
|
group_name = SiteSetting.discourse_donations_reward_group
|
||||||
|
reward.add_to_group(group_name) if group_name.present?
|
||||||
end
|
end
|
||||||
|
|
||||||
render :json => response
|
render :json => response
|
||||||
@ -28,10 +31,6 @@ module DiscourseDonations
|
|||||||
payment.present? && payment.successful? && current_user.present?
|
payment.present? && payment.successful? && current_user.present?
|
||||||
end
|
end
|
||||||
|
|
||||||
def add_to_group?
|
|
||||||
SiteSetting.discourse_donations_reward_group.present?
|
|
||||||
end
|
|
||||||
|
|
||||||
def secret_key
|
def secret_key
|
||||||
SiteSetting.discourse_donations_secret_key
|
SiteSetting.discourse_donations_secret_key
|
||||||
end
|
end
|
||||||
|
@ -26,5 +26,11 @@ module DiscourseDonations
|
|||||||
post :create
|
post :create
|
||||||
expect(response).to have_http_status(200)
|
expect(response).to have_http_status(200)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'has no rewards' do
|
||||||
|
current_user = log_in(:coding_horror)
|
||||||
|
post :create
|
||||||
|
expect(JSON.parse(response.body)['rewards']).to eq([])
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -2,7 +2,7 @@ require 'rails_helper'
|
|||||||
|
|
||||||
module DiscourseDonations
|
module DiscourseDonations
|
||||||
RSpec.describe DiscourseDonations::Rewards do
|
RSpec.describe DiscourseDonations::Rewards do
|
||||||
let(:grp) { Fabricate(:group, name: 'w00t') }
|
let(:grp) { Fabricate(:group) }
|
||||||
let(:user) { Fabricate(:user) }
|
let(:user) { Fabricate(:user) }
|
||||||
subject { described_class.new(user) }
|
subject { described_class.new(user) }
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user