summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-06-23 20:25:06 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-06-23 20:25:06 +0300
commit40bca5246b6e1cea36932c5e0eae89a63d8f0a03 (patch)
treef2509fed4c77fbbfdc43492d7bf7194bff3a69cb /spec/controllers
parent2ed7cbfba4ff3c6a4cf3e72515a0375544998de0 (diff)
downloadgitlab-ce-40bca5246b6e1cea36932c5e0eae89a63d8f0a03.tar.gz
Fix routing/controller specs for refactored controllers
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/blob_controller_spec.rb2
-rw-r--r--spec/controllers/commit_controller_spec.rb2
-rw-r--r--spec/controllers/commits_controller_spec.rb2
-rw-r--r--spec/controllers/merge_requests_controller_spec.rb4
-rw-r--r--spec/controllers/tree_controller_spec.rb2
5 files changed, 6 insertions, 6 deletions
diff --git a/spec/controllers/blob_controller_spec.rb b/spec/controllers/blob_controller_spec.rb
index fe113459470..05d16f35545 100644
--- a/spec/controllers/blob_controller_spec.rb
+++ b/spec/controllers/blob_controller_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe BlobController do
+describe Projects::BlobController do
let(:project) { create(:project_with_code) }
let(:user) { create(:user) }
diff --git a/spec/controllers/commit_controller_spec.rb b/spec/controllers/commit_controller_spec.rb
index 5fffbf0e5f3..87c54143a05 100644
--- a/spec/controllers/commit_controller_spec.rb
+++ b/spec/controllers/commit_controller_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe CommitController do
+describe Projects::CommitController do
let(:project) { create(:project_with_code) }
let(:user) { create(:user) }
let(:commit) { project.repository.last_commit_for("master") }
diff --git a/spec/controllers/commits_controller_spec.rb b/spec/controllers/commits_controller_spec.rb
index ce4029173a5..c9931a19622 100644
--- a/spec/controllers/commits_controller_spec.rb
+++ b/spec/controllers/commits_controller_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe CommitsController do
+describe Projects::CommitsController do
let(:project) { create(:project_with_code) }
let(:user) { create(:user) }
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
diff --git a/spec/controllers/tree_controller_spec.rb b/spec/controllers/tree_controller_spec.rb
index f9fe4fe2010..3e41b406c4f 100644
--- a/spec/controllers/tree_controller_spec.rb
+++ b/spec/controllers/tree_controller_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe TreeController do
+describe Projects::TreeController do
let(:project) { create(:project_with_code) }
let(:user) { create(:user) }