summaryrefslogtreecommitdiff
path: root/spec/controllers/commit_controller_spec.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-12 16:47:06 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-12 16:47:06 -0800
commit1343b2dfac288eb60d536cc3d1a94de1eb178b51 (patch)
tree9b593febf0ca24c2ae4c68fa4a44e058dd512f94 /spec/controllers/commit_controller_spec.rb
parentf9880c11f754c278cbd00eb34ea65e90160571db (diff)
parent686000446639fbf0756733c822a1ebb19e09e121 (diff)
downloadgitlab-ce-1343b2dfac288eb60d536cc3d1a94de1eb178b51.tar.gz
Merge pull request #8785 from jvanbaarsen/rspec-upgrade
Rspec upgrade
Diffstat (limited to 'spec/controllers/commit_controller_spec.rb')
-rw-r--r--spec/controllers/commit_controller_spec.rb5
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