diff options
author | Robert Speicher <robert@gitlab.com> | 2017-04-28 18:02:17 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-04-28 18:02:17 +0000 |
commit | 2952a447794e492122820b5a0eb54f75b83a2abd (patch) | |
tree | b5be71fc8695d1394cb5db5e94ab79190e5ba81c /spec/controllers/projects | |
parent | 3d2b663e0c3c5b40b9db8a27141efd43e2eb1961 (diff) | |
parent | 5069682d8ed892705ec1a933554cc4060e5691af (diff) | |
download | gitlab-ce-2952a447794e492122820b5a0eb54f75b83a2abd.tar.gz |
Merge branch 'enable-spec-file-name-cop' into 'master'
Enable RSpec/FilePath cop
Closes #31316
See merge request !10911
Diffstat (limited to 'spec/controllers/projects')
-rw-r--r-- | spec/controllers/projects/blob_controller_spec.rb | 51 | ||||
-rw-r--r-- | spec/controllers/projects/todos_controller_spec.rb (renamed from spec/controllers/projects/todo_controller_spec.rb) | 0 |
2 files changed, 51 insertions, 0 deletions
diff --git a/spec/controllers/projects/blob_controller_spec.rb b/spec/controllers/projects/blob_controller_spec.rb index 0fd09d156c4..3b3caa9d3e6 100644 --- a/spec/controllers/projects/blob_controller_spec.rb +++ b/spec/controllers/projects/blob_controller_spec.rb @@ -3,6 +3,57 @@ require 'rails_helper' describe Projects::BlobController do let(:project) { create(:project, :public, :repository) } + describe "GET show" do + render_views + + context 'with file path' do + before do + get(:show, + namespace_id: project.namespace, + project_id: project, + id: id) + end + + context "valid branch, valid file" do + let(:id) { 'master/README.md' } + it { is_expected.to respond_with(:success) } + end + + context "valid branch, invalid file" do + let(:id) { 'master/invalid-path.rb' } + it { is_expected.to respond_with(:not_found) } + end + + context "invalid branch, valid file" do + let(:id) { 'invalid-branch/README.md' } + it { is_expected.to respond_with(:not_found) } + end + + context "binary file" do + let(:id) { 'binary-encoding/encoding/binary-1.bin' } + it { is_expected.to respond_with(:success) } + end + end + + context 'with tree path' do + before do + get(:show, + namespace_id: project.namespace, + project_id: project, + id: id) + controller.instance_variable_set(:@blob, nil) + end + + context 'redirect to tree' do + let(:id) { 'markdown/doc' } + it 'redirects' do + expect(subject). + to redirect_to("/#{project.path_with_namespace}/tree/markdown/doc") + end + end + end + end + describe 'GET diff' do let(:user) { create(:user) } diff --git a/spec/controllers/projects/todo_controller_spec.rb b/spec/controllers/projects/todos_controller_spec.rb index c5a4153d991..c5a4153d991 100644 --- a/spec/controllers/projects/todo_controller_spec.rb +++ b/spec/controllers/projects/todos_controller_spec.rb |