From 5303cc285a2067b59f1e8b68f707e8dbf90fe59e Mon Sep 17 00:00:00 2001
From: Robb Kidd <robb@thekidds.org>
Date: Mon, 21 May 2012 16:05:12 -0400
Subject: [PATCH] Add resque_spec to test queuing mail.
---
Gemfile | 1 +
Gemfile.lock | 4 ++++
config/initializers/resque_mailer.rb | 1 +
spec/requests/admin/admin_projects_spec.rb | 1 +
spec/requests/admin/admin_users_spec.rb | 4 +++-
spec/requests/issues_spec.rb | 4 +++-
6 files changed, 13 insertions(+), 2 deletions(-)
create mode 100644 config/initializers/resque_mailer.rb
diff --git a/Gemfile b/Gemfile
index 7208141635a0c..98168dbd39e26 100644
--- a/Gemfile
+++ b/Gemfile
@@ -77,4 +77,5 @@ group :test do
gem "simplecov", :require => false
gem "shoulda-matchers"
gem 'email_spec'
+ gem 'resque_spec'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index bdf78c46e0103..41cb556babe09 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -263,6 +263,9 @@ GEM
resque_mailer (2.0.3)
actionmailer (>= 3.0.0)
resque (>= 1.2.3)
+ resque_spec (0.11.0)
+ resque (>= 1.19.0)
+ rspec (>= 2.5.0)
rspec (2.10.0)
rspec-core (~> 2.10.0)
rspec-expectations (~> 2.10.0)
@@ -391,6 +394,7 @@ DEPENDENCIES
redcarpet (~> 2.1.1)
resque (~> 1.20.0)
resque_mailer
+ resque_spec
rspec-rails
sass-rails (= 3.2.5)
seed-fu
diff --git a/config/initializers/resque_mailer.rb b/config/initializers/resque_mailer.rb
new file mode 100644
index 0000000000000..cec9dec9d0eff
--- /dev/null
+++ b/config/initializers/resque_mailer.rb
@@ -0,0 +1 @@
+Resque::Mailer.excluded_environments = []
diff --git a/spec/requests/admin/admin_projects_spec.rb b/spec/requests/admin/admin_projects_spec.rb
index 9a33c6936a704..fb6577de32688 100644
--- a/spec/requests/admin/admin_projects_spec.rb
+++ b/spec/requests/admin/admin_projects_spec.rb
@@ -88,6 +88,7 @@
fill_in 'Name', :with => 'NewProject'
fill_in 'Code', :with => 'NPR'
fill_in 'Path', :with => 'gitlabhq_1'
+ fill_in 'Description', :with => 'New Project Description'
expect { click_button "Save" }.to change { Project.count }.by(1)
@project = Project.last
end
diff --git a/spec/requests/admin/admin_users_spec.rb b/spec/requests/admin/admin_users_spec.rb
index 91082a644b5fc..c98ed2cf6db65 100644
--- a/spec/requests/admin/admin_users_spec.rb
+++ b/spec/requests/admin/admin_users_spec.rb
@@ -45,7 +45,9 @@
end
it "should send valid email to user with email & password" do
- click_button "Save"
+ with_resque do
+ click_button "Save"
+ end
user = User.last
email = ActionMailer::Base.deliveries.last
email.subject.should have_content("Account was created")
diff --git a/spec/requests/issues_spec.rb b/spec/requests/issues_spec.rb
index 5c59675b4592c..aa43b997f8a7f 100644
--- a/spec/requests/issues_spec.rb
+++ b/spec/requests/issues_spec.rb
@@ -133,7 +133,9 @@
end
it "should send valid email to user" do
- click_button "Submit new issue"
+ with_resque do
+ click_button "Submit new issue"
+ end
issue = Issue.last
email = ActionMailer::Base.deliveries.last
email.subject.should have_content("New Issue was created")
--
GitLab