diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-06-03 11:42:02 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-06-03 11:42:02 +0300 |
commit | 3f4ac2ff60c9d83ec65b19070e4d054e12e67dd2 (patch) | |
tree | 70cd83dbaeb39c2055a2327ce33c5fe4b858481b /spec | |
parent | ae5f17ae2dc0009ca5fce9a46db18af943dffbd5 (diff) | |
parent | 334cb868213bfc08e83c6d12fbda04ca15fd67f0 (diff) | |
download | gitlab-ce-3f4ac2ff60c9d83ec65b19070e4d054e12e67dd2.tar.gz |
Merge branch 'dz-code-tab'
See merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4431
Diffstat (limited to 'spec')
-rw-r--r-- | spec/controllers/projects/branches_controller_spec.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/spec/controllers/projects/branches_controller_spec.rb b/spec/controllers/projects/branches_controller_spec.rb index 8ad73472117..c4b4a888b4e 100644 --- a/spec/controllers/projects/branches_controller_spec.rb +++ b/spec/controllers/projects/branches_controller_spec.rb @@ -122,27 +122,23 @@ describe Projects::BranchesController do let(:branch) { "feature" } it { expect(response.status).to eq(200) } - it { expect(subject).to render_template('destroy') } end context "valid branch name with unencoded slashes" do let(:branch) { "improve/awesome" } it { expect(response.status).to eq(200) } - it { expect(subject).to render_template('destroy') } end context "valid branch name with encoded slashes" do let(:branch) { "improve%2Fawesome" } it { expect(response.status).to eq(200) } - it { expect(subject).to render_template('destroy') } end context "invalid branch name, valid ref" do let(:branch) { "no-branch" } it { expect(response.status).to eq(404) } - it { expect(subject).to render_template('destroy') } end end end |