diff options
author | Stan Hu <stanhu@gmail.com> | 2015-07-21 02:55:45 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2015-07-22 00:12:43 +0300 |
commit | 643557dabccbb3a503b0867ae44ec5701759d2a8 (patch) | |
tree | d50c3315b5e4a7461deac389a09a3aceb5b60e03 /spec/controllers | |
parent | 57f9a1ccd4e97747cf09ffd98e8c44056c0846e5 (diff) |
Fix 404 error in files view after deleting the last file in a repository
Closes #1362
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/projects/tree_controller_spec.rb (renamed from spec/controllers/tree_controller_spec.rb) | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/spec/controllers/tree_controller_spec.rb b/spec/controllers/projects/tree_controller_spec.rb index e09caf5df13..53915856357 100644 --- a/spec/controllers/tree_controller_spec.rb +++ b/spec/controllers/projects/tree_controller_spec.rb @@ -8,9 +8,6 @@ describe Projects::TreeController do sign_in(user) project.team << [user, :master] - - allow(project).to receive(:branches).and_return(['master', 'foo/bar/baz']) - allow(project).to receive(:tags).and_return(['v1.0.0', 'v2.0.0']) controller.instance_variable_set(:@project, project) end @@ -44,6 +41,32 @@ describe Projects::TreeController do let(:id) { 'invalid-branch/encoding/' } it { is_expected.to respond_with(:not_found) } end + + context "valid empty branch, invalid path" do + let(:id) { 'empty-branch/invalid-path/' } + it { is_expected.to respond_with(:not_found) } + end + + context "valid empty branch" do + let(:id) { 'empty-branch' } + it { is_expected.to respond_with(:success) } + end + + context "invalid SHA commit ID" do + let(:id) { 'ff39438/.gitignore' } + it { is_expected.to respond_with(:not_found) } + end + + context "valid SHA commit ID" do + let(:id) { '6d39438' } + it { is_expected.to respond_with(:success) } + end + + context "valid SHA commit ID with path" do + let(:id) { '6d39438/.gitignore' } + it { expect(response.status).to eq(302) } + end + end describe 'GET show with blob path' do |