summaryrefslogtreecommitdiff
path: root/spec/controllers/projects/blob_controller_spec.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-08-03 13:13:06 +0200
committerDouwe Maan <douwe@selenight.nl>2017-08-03 13:13:06 +0200
commit2197ee02e95ade455785cc1769bf3a40a082a799 (patch)
tree387a303a1bce6e5002c78a6d41c904ceffe2b357 /spec/controllers/projects/blob_controller_spec.rb
parentd0ffbd18fa5be4e90d150bc617d0cc7eb3c8720b (diff)
parent1018ab0516fd94d1ffbc05a0ad8499947dd9630d (diff)
downloadgitlab-ce-2197ee02e95ade455785cc1769bf3a40a082a799.tar.gz
Merge branch 'master' into ide
Diffstat (limited to 'spec/controllers/projects/blob_controller_spec.rb')
-rw-r--r--spec/controllers/projects/blob_controller_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/projects/blob_controller_spec.rb b/spec/controllers/projects/blob_controller_spec.rb
index a90ad60e6a8..540ba8c8e59 100644
--- a/spec/controllers/projects/blob_controller_spec.rb
+++ b/spec/controllers/projects/blob_controller_spec.rb
@@ -68,7 +68,7 @@ describe Projects::BlobController do
let(:id) { 'markdown/doc' }
it 'redirects' do
expect(subject)
- .to redirect_to("/#{project.path_with_namespace}/tree/markdown/doc")
+ .to redirect_to("/#{project.full_path}/tree/markdown/doc")
end
end
end
@@ -213,7 +213,7 @@ describe Projects::BlobController do
context "when user doesn't have access" do
before do
- other_project = create(:empty_project)
+ other_project = create(:project, :repository)
merge_request.update!(source_project: other_project, target_project: other_project)
end