diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-12-21 15:37:44 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-12-21 15:37:44 +0400 |
commit | b510f8c4965b210cc1a583fc15dc09871669e1bf (patch) | |
tree | 64c6f4b49b8d67a574b57ef2b4df7002d3a0234c /spec | |
parent | 4398bdf2c953bf159cef1b8e34c5ec44f582b814 (diff) |
Fixed tests
Diffstat (limited to 'spec')
-rw-r--r-- | spec/observers/issue_observer_spec.rb | 8 | ||||
-rw-r--r-- | spec/tasks/gitlab/backup_rake_spec.rb | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/spec/observers/issue_observer_spec.rb b/spec/observers/issue_observer_spec.rb index 509c1d02b49..bbffbd342db 100644 --- a/spec/observers/issue_observer_spec.rb +++ b/spec/observers/issue_observer_spec.rb @@ -85,7 +85,7 @@ describe IssueObserver do it 'notification is delivered if the issue being closed' do issue.stub(:is_being_closed?).and_return(true) - Notify.should_receive(:issue_status_changed_email).twice + Notify.should_receive(:issue_status_changed_email).twice.and_return(stub(deliver: true)) Note.should_receive(:create_status_change_note).with(issue, some_user, 'closed') subject.after_update(issue) @@ -104,7 +104,7 @@ describe IssueObserver do issue_without_assignee.stub(:is_being_reassigned?).and_return(false) issue_without_assignee.stub(:is_being_closed?).and_return(true) issue_without_assignee.stub(:is_being_reopened?).and_return(false) - Notify.should_receive(:issue_status_changed_email).once + Notify.should_receive(:issue_status_changed_email).once.and_return(stub(deliver: true)) Note.should_receive(:create_status_change_note).with(issue_without_assignee, some_user, 'closed') subject.after_update(issue_without_assignee) @@ -128,7 +128,7 @@ describe IssueObserver do it 'notification is delivered if the issue being reopened' do issue.stub(:is_being_reopened?).and_return(true) - Notify.should_receive(:issue_status_changed_email).twice + Notify.should_receive(:issue_status_changed_email).twice.and_return(stub(deliver: true)) Note.should_receive(:create_status_change_note).with(issue, some_user, 'reopened') subject.after_update(issue) @@ -147,7 +147,7 @@ describe IssueObserver do issue_without_assignee.stub(:is_being_reassigned?).and_return(false) issue_without_assignee.stub(:is_being_closed?).and_return(false) issue_without_assignee.stub(:is_being_reopened?).and_return(true) - Notify.should_receive(:issue_status_changed_email).once + Notify.should_receive(:issue_status_changed_email).once.and_return(stub(deliver: true)) Note.should_receive(:create_status_change_note).with(issue_without_assignee, some_user, 'reopened') subject.after_update(issue_without_assignee) diff --git a/spec/tasks/gitlab/backup_rake_spec.rb b/spec/tasks/gitlab/backup_rake_spec.rb index d9aa0543969..b17521e0148 100644 --- a/spec/tasks/gitlab/backup_rake_spec.rb +++ b/spec/tasks/gitlab/backup_rake_spec.rb @@ -15,8 +15,8 @@ describe 'gitlab:app namespace rake task' do end let :run_rake_task do - Rake::Task["gitlab:app:backup_restore"].reenable - Rake.application.invoke_task "gitlab:app:backup_restore" + Rake::Task["gitlab:backup:restore"].reenable + Rake.application.invoke_task "gitlab:backup:restore" end context 'gitlab version' do @@ -36,8 +36,8 @@ describe 'gitlab:app namespace rake task' do it 'should invoke restoration on mach' do YAML.stub :load_file => {:gitlab_version => gitlab_version} - Rake::Task["gitlab:app:db_restore"].should_receive :invoke - Rake::Task["gitlab:app:repo_restore"].should_receive :invoke + Rake::Task["gitlab:backup:db:restore"].should_receive :invoke + Rake::Task["gitlab:backup:repo:restore"].should_receive :invoke expect { run_rake_task }.to_not raise_error SystemExit end end |