diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-12 16:47:52 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-12 16:47:52 -0800 |
| commit | 529188e4788991961796b1b6131389072ee61efb (patch) | |
| tree | c4c12a7b2cb287fbc4065c886e53740e1ec41ae5 /spec/controllers/commit_controller_spec.rb | |
| parent | 2ff1b8e68d085a8b43507630b3986743d2a48145 (diff) | |
| parent | 1343b2dfac288eb60d536cc3d1a94de1eb178b51 (diff) | |
| download | gitlab-ce-529188e4788991961796b1b6131389072ee61efb.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Diffstat (limited to 'spec/controllers/commit_controller_spec.rb')
| -rw-r--r-- | spec/controllers/commit_controller_spec.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/controllers/commit_controller_spec.rb b/spec/controllers/commit_controller_spec.rb index cd8b46d7672..f0e39e674fd 100644 --- a/spec/controllers/commit_controller_spec.rb +++ b/spec/controllers/commit_controller_spec.rb @@ -19,7 +19,7 @@ describe Projects::CommitController do end it "should generate it" do - Commit.any_instance.should_receive(:"to_#{format}") + expect_any_instance_of(Commit).to receive(:"to_#{format}") get :show, project_id: project.to_param, id: commit.id, format: format end @@ -31,7 +31,8 @@ describe Projects::CommitController do end it "should not escape Html" do - Commit.any_instance.stub(:"to_#{format}").and_return('HTML entities &<>" ') + allow_any_instance_of(Commit).to receive(:"to_#{format}"). + and_return('HTML entities &<>" ') get :show, project_id: project.to_param, id: commit.id, format: format |