diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-23 21:25:06 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-23 21:25:06 +0400 |
| commit | 40bca5246b6e1cea36932c5e0eae89a63d8f0a03 (patch) | |
| tree | f2509fed4c77fbbfdc43492d7bf7194bff3a69cb /spec/controllers/merge_requests_controller_spec.rb | |
| parent | 2ed7cbfba4ff3c6a4cf3e72515a0375544998de0 (diff) | |
Fix routing/controller specs for refactored controllers
Diffstat (limited to 'spec/controllers/merge_requests_controller_spec.rb')
| -rw-r--r-- | spec/controllers/merge_requests_controller_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/merge_requests_controller_spec.rb b/spec/controllers/merge_requests_controller_spec.rb index 796de23bfe3..51ba6ca5945 100644 --- a/spec/controllers/merge_requests_controller_spec.rb +++ b/spec/controllers/merge_requests_controller_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe MergeRequestsController do +describe Projects::MergeRequestsController do let(:project) { create(:project_with_code) } let(:user) { create(:user) } let(:merge_request) { create(:merge_request_with_diffs, project: project, target_branch: "bcf03b5d~3", source_branch: "bcf03b5d") } @@ -8,7 +8,7 @@ describe MergeRequestsController do before do sign_in(user) project.team << [user, :master] - MergeRequestsController.any_instance.stub(validates_merge_request: true) + Projects::MergeRequestsController.any_instance.stub(validates_merge_request: true) end describe "#show" do |