From: Robb Kidd <robb@thekidds.org>
Date: Mon, 21 May 2012 20:05:12 +0000 (-0400)
Subject: Add resque_spec to test queuing mail.
X-Git-Tag: v2.6.3~5^2~6
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5303cc285a2067b59f1e8b68f707e8dbf90fe59e;p=wvm%2Fgitlab.git

Add resque_spec to test queuing mail.
---

diff --git a/Gemfile b/Gemfile
index 720814163..98168dbd3 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 bdf78c46e..41cb556ba 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 000000000..cec9dec9d
--- /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 9a33c6936..fb6577de3 100644
--- a/spec/requests/admin/admin_projects_spec.rb
+++ b/spec/requests/admin/admin_projects_spec.rb
@@ -88,6 +88,7 @@ describe "Admin::Projects" do
       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 91082a644..c98ed2cf6 100644
--- a/spec/requests/admin/admin_users_spec.rb
+++ b/spec/requests/admin/admin_users_spec.rb
@@ -45,7 +45,9 @@ describe "Admin::Users" do
     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 5c59675b4..aa43b997f 100644
--- a/spec/requests/issues_spec.rb
+++ b/spec/requests/issues_spec.rb
@@ -133,7 +133,9 @@ describe "Issues" do
         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")