diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-18 21:07:37 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-18 21:07:37 +0000 |
commit | 7f8330873c1a5860b8a9a52d111083a65d210249 (patch) | |
tree | e6c7019f2942b8d2fff313545b7cb4bb996b6870 /spec/controllers/projects/tree_controller_spec.rb | |
parent | bbe243060399191abcba33c7ebd611f6ec34c6cd (diff) | |
download | gitlab-ce-7f8330873c1a5860b8a9a52d111083a65d210249.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/projects/tree_controller_spec.rb')
-rw-r--r-- | spec/controllers/projects/tree_controller_spec.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/controllers/projects/tree_controller_spec.rb b/spec/controllers/projects/tree_controller_spec.rb index f89881af5e2..c0c11db5dd6 100644 --- a/spec/controllers/projects/tree_controller_spec.rb +++ b/spec/controllers/projects/tree_controller_spec.rb @@ -45,7 +45,7 @@ describe Projects::TreeController do it 'redirects' do expect(subject) - .to redirect_to("/#{project.full_path}/-/tree/master") + .to redirect_to("/#{project.full_path}/tree/master") end end @@ -60,7 +60,7 @@ describe Projects::TreeController do it 'redirects' do expect(subject) - .to redirect_to("/#{project.full_path}/-/tree/empty-branch") + .to redirect_to("/#{project.full_path}/tree/empty-branch") end end @@ -125,7 +125,7 @@ describe Projects::TreeController do let(:id) { 'master/README.md' } it 'redirects' do - redirect_url = "/#{project.full_path}/-/blob/master/README.md" + redirect_url = "/#{project.full_path}/blob/master/README.md" expect(subject) .to redirect_to(redirect_url) end @@ -153,7 +153,7 @@ describe Projects::TreeController do it 'redirects to the new directory' do expect(subject) - .to redirect_to("/#{project.full_path}/-/tree/#{branch_name}/#{path}") + .to redirect_to("/#{project.full_path}/tree/#{branch_name}/#{path}") expect(flash[:notice]).to eq('The directory has been successfully created.') end end @@ -164,7 +164,7 @@ describe Projects::TreeController do it 'does not allow overwriting of existing files' do expect(subject) - .to redirect_to("/#{project.full_path}/-/tree/master") + .to redirect_to("/#{project.full_path}/tree/master") expect(flash[:alert]).to eq('A file with this name already exists') end end |