summaryrefslogtreecommitdiff
path: root/spec/requests/admin
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-09 09:14:05 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-09 09:14:05 +0300
commit9773ccc4519c4c35f969248c4e0f13689b631760 (patch)
treec8780c4bfcb5135dfc465f2f0d03424501ed3382 /spec/requests/admin
parent71bd9568669d18bc04c551a603a04af2ea99328c (diff)
downloadgitlab-ce-9773ccc4519c4c35f969248c4e0f13689b631760.tar.gz
sidekiq with green tests
Diffstat (limited to 'spec/requests/admin')
-rw-r--r--spec/requests/admin/admin_users_spec.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/spec/requests/admin/admin_users_spec.rb b/spec/requests/admin/admin_users_spec.rb
index ca134c2d4f7..a66e85a34f9 100644
--- a/spec/requests/admin/admin_users_spec.rb
+++ b/spec/requests/admin/admin_users_spec.rb
@@ -41,7 +41,7 @@ describe "Admin::Users" do
end
it "should call send mail" do
- Notify.should_receive(:new_user_email).and_return(stub(deliver: true))
+ Notify.should_receive(:new_user_email)
User.observers.enable :user_observer do
click_button "Save"
@@ -50,9 +50,7 @@ describe "Admin::Users" do
it "should send valid email to user with email & password" do
User.observers.enable :user_observer do
- with_resque do
- click_button "Save"
- end
+ click_button "Save"
user = User.last
email = ActionMailer::Base.deliveries.last
email.subject.should have_content("Account was created")