remove extra key/values from user create job

app/jobs/regular/donation_user.rb

@@ -2,7 +2,7 @@
 module Jobs
   class DonationUser < ::Jobs::Base
     def execute(args)
-      user = User.create!(args)
+      user = User.create!(args.slice(:username, :password, :name, :email))
       rewards = DiscourseDonations::Rewards.new(user)
       args[:rewards].to_a.each do |reward|
         rewards.grant_badge(reward[:name]) if reward[:type] == 'badge'

spec/jobs/regular/donation_user_spec.rb

@@ -17,40 +17,49 @@ RSpec.describe Jobs::DonationUser, type: :job do
   end
 
   describe 'rewards' do
-    let(:user) { Fabricate(:user) }
+    describe 'create user with rewards' do
-    let(:badge) { Fabricate(:badge) }
+      it 'creates a User object without rewards' do
-    let(:grp) { Fabricate(:group) }
+        User.expects(:create!).with(args)
-
+        subject.execute(args.merge(rewards: [], otherthing: nil))
-    before do
+      end
-      User.expects(:create!).returns(user)
     end
 
-    it 'grants the user a badge' do
+    describe 'User rewards' do
-      subject.execute(args.merge(rewards: [{ type: 'badge', name: badge.name }]))
+      let(:user) { Fabricate(:user) }
-      aggregate_failures do
+      let(:badge) { Fabricate(:badge) }
-        expect(user.badges).to include(badge)
+      let(:grp) { Fabricate(:group) }
+
+      before do
+        User.stubs(:create!).returns(user)
+      end
+
+      it 'grants the user a badge' do
+        subject.execute(args.merge(rewards: [{ type: 'badge', name: badge.name }]))
+        aggregate_failures do
+          expect(user.badges).to include(badge)
+          expect(user.groups).to be_empty
+        end
+      end
+
+      it 'adds the user to the group' do
+        subject.execute(args.merge(rewards: [{ type: 'group', name: grp.name }]))
+        aggregate_failures do
+          expect(user.badges).to be_empty
+          expect(user.groups).to include(grp)
+        end
+      end
+
+      it 'has no collisions in badges' do
+        Fabricate(:badge, name: 'weiner_schitzel')
+        subject.execute(args.merge(rewards: [{ type: 'group', name: 'weiner_schitzel' }]))
+        expect(user.badges).to be_empty
+      end
+
+      it 'has no collisions in groups' do
+        Fabricate(:group, name: 'dude_ranch')
+        subject.execute(args.merge(rewards: [{ type: 'badge', name: 'dude_ranch' }]))
         expect(user.groups).to be_empty
       end
     end
-
-    it 'adds the user to the group' do
-      subject.execute(args.merge(rewards: [{ type: 'group', name: grp.name }]))
-      aggregate_failures do
-        expect(user.badges).to be_empty
-        expect(user.groups).to include(grp)
-      end
-    end
-
-    it 'has no collisions in badges' do
-      Fabricate(:badge, name: 'weiner_schitzel')
-      subject.execute(args.merge(rewards: [{ type: 'group', name: 'weiner_schitzel' }]))
-      expect(user.badges).to be_empty
-    end
-
-    it 'has no collisions in groups' do
-      Fabricate(:group, name: 'dude_ranch')
-      subject.execute(args.merge(rewards: [{ type: 'badge', name: 'dude_ranch' }]))
-      expect(user.groups).to be_empty
-    end
   end
 end