diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-04-10 11:51:24 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-04-10 11:51:24 +0000 |
commit | 6331759735074e2b14d398dfa1804cfa1f241d49 (patch) | |
tree | a7155181e56614daa890fa245f76e00a4df753ac /spec | |
parent | 149195eded675717e6c5c1e3a8b1dae2d4082ae0 (diff) | |
parent | 7d089701f1a9c15117e3e2d6f21eabaf08659ff6 (diff) | |
download | gitlab-ce-6331759735074e2b14d398dfa1804cfa1f241d49.tar.gz |
Merge branch 'fix-submodules-with-relative-links' into 'master'
Fix broken file browsing with a submodule that has a relative link
## What does this MR do?
This MR fixes an error that occurs when browsing a submodule with a relative link.
### Are there points in the code the reviewer needs to double check?
I re-wrote the function because I was confused by how the first one was supposed to work. Please review if it's clearer.
### Why was this MR needed?
A 500 Error would occur when using the file browser on a repo with a submodule. Here's how to reproduce the bug:
1. Start a new project in GitLab.
2. Clone git://git.gniibe.org/gnuk/gnuk.git/ locally.
3. Push repo to new project.
4. Click on "Files" in the project.
The .gitmodules file:
```
[submodule "chopstx"]
path = chopstx
url = ../../chopstx/chopstx.git
```
### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?
1. #775
2. #1385
3. https://github.com/gitlabhq/gitlabhq/issues/8153
4. https://github.com/gitlabhq/gitlabhq/issues/8881
5. https://github.com/gitlabhq/gitlabhq/issues/7554
See merge request !508
Diffstat (limited to 'spec')
-rw-r--r-- | spec/helpers/submodule_helper_spec.rb | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/spec/helpers/submodule_helper_spec.rb b/spec/helpers/submodule_helper_spec.rb index aef1108e333..e99c3f5bc11 100644 --- a/spec/helpers/submodule_helper_spec.rb +++ b/spec/helpers/submodule_helper_spec.rb @@ -1,6 +1,8 @@ require 'spec_helper' describe SubmoduleHelper do + include RepoHelpers + describe 'submodule links' do let(:submodule_item) { double(id: 'hash', path: 'rack') } let(:config) { Gitlab.config.gitlab } @@ -111,6 +113,39 @@ describe SubmoduleHelper do expect(submodule_links(submodule_item)).to eq([ repo.submodule_url_for, nil ]) end end + + context 'submodules with relative links' do + let(:group) { create(:group) } + let(:project) { create(:project, group: group) } + + before do + self.instance_variable_set(:@project, project) + end + + it 'one level down' do + commit_id = sample_commit[:id] + result = relative_self_links('../test.git', commit_id) + expect(result).to eq(["/#{group.path}/test", "/#{group.path}/test/tree/#{commit_id}"]) + end + + it 'two levels down' do + commit_id = sample_commit[:id] + result = relative_self_links('../../test.git', commit_id) + expect(result).to eq(["/#{group.path}/test", "/#{group.path}/test/tree/#{commit_id}"]) + end + + it 'one level down with namespace and repo' do + commit_id = sample_commit[:id] + result = relative_self_links('../foobar/test.git', commit_id) + expect(result).to eq(["/foobar/test", "/foobar/test/tree/#{commit_id}"]) + end + + it 'two levels down with namespace and repo' do + commit_id = sample_commit[:id] + result = relative_self_links('../foobar/baz/test.git', commit_id) + expect(result).to eq(["/baz/test", "/baz/test/tree/#{commit_id}"]) + end + end end def stub_url(url) |