Merge branch 'master' into features/publicity

# Conflicts: # .gitignore
2017-04-18 16:22:36 +02:00
parent 93dc7b0c50 cb1bf34588
commit 8cb8aea9ca
13 changed files with 11 additions and 81 deletions
@@ -21,7 +21,7 @@ feature 'Support' do
    sleep 5 # Do a real sleep to have a real integration test

    expect(ActionMailer::Base.deliveries.count).to eq 0
-    expect_any_instance_of(SupportersController).to receive(:mailchimp_registration).and_return(true)
+    expect_any_instance_of(SupportersController).to receive(:sendy_registraion).and_return(true)

    expect { click_button 'Unterstützung zusichern' }.to change { Supporter.count }.by(1)
    # expect(ActionMailer::Base.deliveries.count).to eq 1