From 9acaf513078c8a91cfa53f0ddcd7b9750082a82d Mon Sep 17 00:00:00 2001
From: Rimian Perkins <hello@rimian.com.au>
Date: Mon, 24 Apr 2017 06:05:51 +1000
Subject: [PATCH] explicitly specify group name

---
 app/controllers/discourse_donations/charges_controller.rb   | 4 ++--
 config/settings.yml                                         | 2 +-
 .../discourse_donations/charges_controller_spec.rb          | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/discourse_donations/charges_controller.rb b/app/controllers/discourse_donations/charges_controller.rb
index 18919e5..dea67bf 100644
--- a/app/controllers/discourse_donations/charges_controller.rb
+++ b/app/controllers/discourse_donations/charges_controller.rb
@@ -18,9 +18,9 @@ module DiscourseDonations
 
       if reward_user?(payment)
         reward = DiscourseDonations::Rewards.new(current_user)
-        group_name = SiteSetting.discourse_donations_reward_group
+        group_name = SiteSetting.discourse_donations_reward_group_name
         if reward.add_to_group(group_name)
-          response['rewards']['groups'] = [SiteSetting.discourse_donations_reward_group]
+          response['rewards']['groups'] = [group_name]
         end
       end
 
diff --git a/config/settings.yml b/config/settings.yml
index 8051b6f..87ffd64 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -18,6 +18,6 @@ plugins:
   discourse_donations_reward_badge:
     client: false
     default: 'Donation'
-  discourse_donations_reward_group:
+  discourse_donations_reward_group_name:
     client: false
     default: 'Donation'
diff --git a/spec/controllers/discourse_donations/charges_controller_spec.rb b/spec/controllers/discourse_donations/charges_controller_spec.rb
index a3777f2..a06dd3d 100644
--- a/spec/controllers/discourse_donations/charges_controller_spec.rb
+++ b/spec/controllers/discourse_donations/charges_controller_spec.rb
@@ -29,8 +29,8 @@ module DiscourseDonations
 
     describe 'rewards' do
       before do
-        SiteSetting.stubs(:discourse_donations_reward_group).returns('Skimby')
-        Fabricate(:group, name: SiteSetting.discourse_donations_reward_group)
+        SiteSetting.stubs(:discourse_donations_reward_group_name).returns('Skimby')
+        Fabricate(:group, name: SiteSetting.discourse_donations_reward_group_name)
         log_in :coding_horror
       end
 
@@ -45,7 +45,7 @@ module DiscourseDonations
 
       it 'awards a group' do
         post :create
-        expect(response_rewards['groups']).to eq([SiteSetting.discourse_donations_reward_group])
+        expect(response_rewards['groups']).to eq([SiteSetting.discourse_donations_reward_group_name])
       end
     end
   end