summaryrefslogtreecommitdiff
path: root/spec/helpers/submodule_helper_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/helpers/submodule_helper_spec.rb')
-rw-r--r--spec/helpers/submodule_helper_spec.rb182
1 files changed, 91 insertions, 91 deletions
diff --git a/spec/helpers/submodule_helper_spec.rb b/spec/helpers/submodule_helper_spec.rb
index ea48c69e0ae..c0acd7411d4 100644
--- a/spec/helpers/submodule_helper_spec.rb
+++ b/spec/helpers/submodule_helper_spec.rb
@@ -1,167 +1,167 @@
-require 'spec_helper'
+require "spec_helper"
describe SubmoduleHelper do
include RepoHelpers
- describe 'submodule links' do
- let(:submodule_item) { double(id: 'hash', path: 'rack') }
+ describe "submodule links" do
+ let(:submodule_item) { double(id: "hash", path: "rack") }
let(:config) { Gitlab.config.gitlab }
let(:repo) { double }
before do
- self.instance_variable_set(:@repository, repo)
+ instance_variable_set(:@repository, repo)
end
- context 'submodule on self' do
+ context "submodule on self" do
before do
- allow(Gitlab.config.gitlab).to receive(:protocol).and_return('http') # set this just to be sure
+ allow(Gitlab.config.gitlab).to receive(:protocol).and_return("http") # set this just to be sure
end
- it 'detects ssh on standard port' do
+ it "detects ssh on standard port" do
allow(Gitlab.config.gitlab_shell).to receive(:ssh_port).and_return(22) # set this just to be sure
allow(Gitlab.config.gitlab_shell).to receive(:ssh_path_prefix).and_return(Settings.send(:build_gitlab_shell_ssh_path_prefix))
- stub_url([config.user, '@', config.host, ':gitlab-org/gitlab-ce.git'].join(''))
- expect(submodule_links(submodule_item)).to eq([namespace_project_path('gitlab-org', 'gitlab-ce'), namespace_project_tree_path('gitlab-org', 'gitlab-ce', 'hash')])
+ stub_url([config.user, "@", config.host, ":gitlab-org/gitlab-ce.git"].join(""))
+ expect(submodule_links(submodule_item)).to eq([namespace_project_path("gitlab-org", "gitlab-ce"), namespace_project_tree_path("gitlab-org", "gitlab-ce", "hash")])
end
- it 'detects ssh on non-standard port' do
+ it "detects ssh on non-standard port" do
allow(Gitlab.config.gitlab_shell).to receive(:ssh_port).and_return(2222)
allow(Gitlab.config.gitlab_shell).to receive(:ssh_path_prefix).and_return(Settings.send(:build_gitlab_shell_ssh_path_prefix))
- stub_url(['ssh://', config.user, '@', config.host, ':2222/gitlab-org/gitlab-ce.git'].join(''))
- expect(submodule_links(submodule_item)).to eq([namespace_project_path('gitlab-org', 'gitlab-ce'), namespace_project_tree_path('gitlab-org', 'gitlab-ce', 'hash')])
+ stub_url(["ssh://", config.user, "@", config.host, ":2222/gitlab-org/gitlab-ce.git"].join(""))
+ expect(submodule_links(submodule_item)).to eq([namespace_project_path("gitlab-org", "gitlab-ce"), namespace_project_tree_path("gitlab-org", "gitlab-ce", "hash")])
end
- it 'detects http on standard port' do
+ it "detects http on standard port" do
allow(Gitlab.config.gitlab).to receive(:port).and_return(80)
allow(Gitlab.config.gitlab).to receive(:url).and_return(Settings.send(:build_gitlab_url))
- stub_url(['http://', config.host, '/gitlab-org/gitlab-ce.git'].join(''))
- expect(submodule_links(submodule_item)).to eq([namespace_project_path('gitlab-org', 'gitlab-ce'), namespace_project_tree_path('gitlab-org', 'gitlab-ce', 'hash')])
+ stub_url(["http://", config.host, "/gitlab-org/gitlab-ce.git"].join(""))
+ expect(submodule_links(submodule_item)).to eq([namespace_project_path("gitlab-org", "gitlab-ce"), namespace_project_tree_path("gitlab-org", "gitlab-ce", "hash")])
end
- it 'detects http on non-standard port' do
+ it "detects http on non-standard port" do
allow(Gitlab.config.gitlab).to receive(:port).and_return(3000)
allow(Gitlab.config.gitlab).to receive(:url).and_return(Settings.send(:build_gitlab_url))
- stub_url(['http://', config.host, ':3000/gitlab-org/gitlab-ce.git'].join(''))
- expect(submodule_links(submodule_item)).to eq([namespace_project_path('gitlab-org', 'gitlab-ce'), namespace_project_tree_path('gitlab-org', 'gitlab-ce', 'hash')])
+ stub_url(["http://", config.host, ":3000/gitlab-org/gitlab-ce.git"].join(""))
+ expect(submodule_links(submodule_item)).to eq([namespace_project_path("gitlab-org", "gitlab-ce"), namespace_project_tree_path("gitlab-org", "gitlab-ce", "hash")])
end
- it 'works with relative_url_root' do
+ it "works with relative_url_root" do
allow(Gitlab.config.gitlab).to receive(:port).and_return(80) # set this just to be sure
- allow(Gitlab.config.gitlab).to receive(:relative_url_root).and_return('/gitlab/root')
+ allow(Gitlab.config.gitlab).to receive(:relative_url_root).and_return("/gitlab/root")
allow(Gitlab.config.gitlab).to receive(:url).and_return(Settings.send(:build_gitlab_url))
- stub_url(['http://', config.host, '/gitlab/root/gitlab-org/gitlab-ce.git'].join(''))
- expect(submodule_links(submodule_item)).to eq([namespace_project_path('gitlab-org', 'gitlab-ce'), namespace_project_tree_path('gitlab-org', 'gitlab-ce', 'hash')])
+ stub_url(["http://", config.host, "/gitlab/root/gitlab-org/gitlab-ce.git"].join(""))
+ expect(submodule_links(submodule_item)).to eq([namespace_project_path("gitlab-org", "gitlab-ce"), namespace_project_tree_path("gitlab-org", "gitlab-ce", "hash")])
end
- it 'works with subgroups' do
+ it "works with subgroups" do
allow(Gitlab.config.gitlab).to receive(:port).and_return(80) # set this just to be sure
- allow(Gitlab.config.gitlab).to receive(:relative_url_root).and_return('/gitlab/root')
+ allow(Gitlab.config.gitlab).to receive(:relative_url_root).and_return("/gitlab/root")
allow(Gitlab.config.gitlab).to receive(:url).and_return(Settings.send(:build_gitlab_url))
- stub_url(['http://', config.host, '/gitlab/root/gitlab-org/sub/gitlab-ce.git'].join(''))
- expect(submodule_links(submodule_item)).to eq([namespace_project_path('gitlab-org/sub', 'gitlab-ce'), namespace_project_tree_path('gitlab-org/sub', 'gitlab-ce', 'hash')])
+ stub_url(["http://", config.host, "/gitlab/root/gitlab-org/sub/gitlab-ce.git"].join(""))
+ expect(submodule_links(submodule_item)).to eq([namespace_project_path("gitlab-org/sub", "gitlab-ce"), namespace_project_tree_path("gitlab-org/sub", "gitlab-ce", "hash")])
end
end
- context 'submodule on github.com' do
- it 'detects ssh' do
- stub_url('git@github.com:gitlab-org/gitlab-ce.git')
- expect(submodule_links(submodule_item)).to eq(['https://github.com/gitlab-org/gitlab-ce', 'https://github.com/gitlab-org/gitlab-ce/tree/hash'])
+ context "submodule on github.com" do
+ it "detects ssh" do
+ stub_url("git@github.com:gitlab-org/gitlab-ce.git")
+ expect(submodule_links(submodule_item)).to eq(["https://github.com/gitlab-org/gitlab-ce", "https://github.com/gitlab-org/gitlab-ce/tree/hash"])
end
- it 'detects http' do
- stub_url('http://github.com/gitlab-org/gitlab-ce.git')
- expect(submodule_links(submodule_item)).to eq(['https://github.com/gitlab-org/gitlab-ce', 'https://github.com/gitlab-org/gitlab-ce/tree/hash'])
+ it "detects http" do
+ stub_url("http://github.com/gitlab-org/gitlab-ce.git")
+ expect(submodule_links(submodule_item)).to eq(["https://github.com/gitlab-org/gitlab-ce", "https://github.com/gitlab-org/gitlab-ce/tree/hash"])
end
- it 'detects https' do
- stub_url('https://github.com/gitlab-org/gitlab-ce.git')
- expect(submodule_links(submodule_item)).to eq(['https://github.com/gitlab-org/gitlab-ce', 'https://github.com/gitlab-org/gitlab-ce/tree/hash'])
+ it "detects https" do
+ stub_url("https://github.com/gitlab-org/gitlab-ce.git")
+ expect(submodule_links(submodule_item)).to eq(["https://github.com/gitlab-org/gitlab-ce", "https://github.com/gitlab-org/gitlab-ce/tree/hash"])
end
- it 'handles urls with no .git on the end' do
- stub_url('http://github.com/gitlab-org/gitlab-ce')
- expect(submodule_links(submodule_item)).to eq(['https://github.com/gitlab-org/gitlab-ce', 'https://github.com/gitlab-org/gitlab-ce/tree/hash'])
+ it "handles urls with no .git on the end" do
+ stub_url("http://github.com/gitlab-org/gitlab-ce")
+ expect(submodule_links(submodule_item)).to eq(["https://github.com/gitlab-org/gitlab-ce", "https://github.com/gitlab-org/gitlab-ce/tree/hash"])
end
- it 'returns original with non-standard url' do
- stub_url('http://github.com/another/gitlab-org/gitlab-ce.git')
+ it "returns original with non-standard url" do
+ stub_url("http://github.com/another/gitlab-org/gitlab-ce.git")
expect(submodule_links(submodule_item)).to eq([repo.submodule_url_for, nil])
end
end
- context 'in-repository submodule' do
+ context "in-repository submodule" do
let(:group) { create(:group, name: "Master Project", path: "master-project") }
let(:project) { create(:project, group: group) }
- it 'in-repository' do
+ it "in-repository" do
allow(repo).to receive(:project).and_return(project)
- stub_url('./')
+ stub_url("./")
expect(submodule_links(submodule_item)).to eq(["/master-project/#{project.path}", "/master-project/#{project.path}/tree/hash"])
end
end
- context 'submodule on gitlab.com' do
- it 'detects ssh' do
- stub_url('git@gitlab.com:gitlab-org/gitlab-ce.git')
- expect(submodule_links(submodule_item)).to eq(['https://gitlab.com/gitlab-org/gitlab-ce', 'https://gitlab.com/gitlab-org/gitlab-ce/tree/hash'])
+ context "submodule on gitlab.com" do
+ it "detects ssh" do
+ stub_url("git@gitlab.com:gitlab-org/gitlab-ce.git")
+ expect(submodule_links(submodule_item)).to eq(["https://gitlab.com/gitlab-org/gitlab-ce", "https://gitlab.com/gitlab-org/gitlab-ce/tree/hash"])
end
- it 'detects http' do
- stub_url('http://gitlab.com/gitlab-org/gitlab-ce.git')
- expect(submodule_links(submodule_item)).to eq(['https://gitlab.com/gitlab-org/gitlab-ce', 'https://gitlab.com/gitlab-org/gitlab-ce/tree/hash'])
+ it "detects http" do
+ stub_url("http://gitlab.com/gitlab-org/gitlab-ce.git")
+ expect(submodule_links(submodule_item)).to eq(["https://gitlab.com/gitlab-org/gitlab-ce", "https://gitlab.com/gitlab-org/gitlab-ce/tree/hash"])
end
- it 'detects https' do
- stub_url('https://gitlab.com/gitlab-org/gitlab-ce.git')
- expect(submodule_links(submodule_item)).to eq(['https://gitlab.com/gitlab-org/gitlab-ce', 'https://gitlab.com/gitlab-org/gitlab-ce/tree/hash'])
+ it "detects https" do
+ stub_url("https://gitlab.com/gitlab-org/gitlab-ce.git")
+ expect(submodule_links(submodule_item)).to eq(["https://gitlab.com/gitlab-org/gitlab-ce", "https://gitlab.com/gitlab-org/gitlab-ce/tree/hash"])
end
- it 'handles urls with no .git on the end' do
- stub_url('http://gitlab.com/gitlab-org/gitlab-ce')
- expect(submodule_links(submodule_item)).to eq(['https://gitlab.com/gitlab-org/gitlab-ce', 'https://gitlab.com/gitlab-org/gitlab-ce/tree/hash'])
+ it "handles urls with no .git on the end" do
+ stub_url("http://gitlab.com/gitlab-org/gitlab-ce")
+ expect(submodule_links(submodule_item)).to eq(["https://gitlab.com/gitlab-org/gitlab-ce", "https://gitlab.com/gitlab-org/gitlab-ce/tree/hash"])
end
- it 'handles urls with trailing whitespace' do
- stub_url('http://gitlab.com/gitlab-org/gitlab-ce.git ')
- expect(submodule_links(submodule_item)).to eq(['https://gitlab.com/gitlab-org/gitlab-ce', 'https://gitlab.com/gitlab-org/gitlab-ce/tree/hash'])
+ it "handles urls with trailing whitespace" do
+ stub_url("http://gitlab.com/gitlab-org/gitlab-ce.git ")
+ expect(submodule_links(submodule_item)).to eq(["https://gitlab.com/gitlab-org/gitlab-ce", "https://gitlab.com/gitlab-org/gitlab-ce/tree/hash"])
end
- it 'returns original with non-standard url' do
- stub_url('http://gitlab.com/another/gitlab-org/gitlab-ce.git')
+ it "returns original with non-standard url" do
+ stub_url("http://gitlab.com/another/gitlab-org/gitlab-ce.git")
expect(submodule_links(submodule_item)).to eq([repo.submodule_url_for, nil])
end
end
- context 'submodule on unsupported' do
- it 'sanitizes unsupported protocols' do
+ context "submodule on unsupported" do
+ it "sanitizes unsupported protocols" do
stub_url('javascript:alert("XSS");')
expect(helper.submodule_links(submodule_item)).to eq([nil, nil])
end
- it 'sanitizes unsupported protocols disguised as a repository URL' do
+ it "sanitizes unsupported protocols disguised as a repository URL" do
stub_url('javascript:alert("XSS");foo/bar.git')
expect(helper.submodule_links(submodule_item)).to eq([nil, nil])
end
- it 'sanitizes invalid URL with extended ASCII' do
- stub_url('é')
+ it "sanitizes invalid URL with extended ASCII" do
+ stub_url("é")
expect(helper.submodule_links(submodule_item)).to eq([nil, nil])
end
- it 'returns original' do
- stub_url('http://mygitserver.com/gitlab-org/gitlab-ce')
+ it "returns original" do
+ stub_url("http://mygitserver.com/gitlab-org/gitlab-ce")
expect(submodule_links(submodule_item)).to eq([repo.submodule_url_for, nil])
- stub_url('http://mygitserver.com/gitlab-org/gitlab-ce.git')
+ stub_url("http://mygitserver.com/gitlab-org/gitlab-ce.git")
expect(submodule_links(submodule_item)).to eq([repo.submodule_url_for, nil])
end
end
- context 'submodules with relative links' do
+ context "submodules with relative links" do
let(:group) { create(:group, name: "top group", path: "top-group") }
let(:project) { create(:project, group: group) }
let(:repo) { double(:repo, project: project) }
@@ -174,21 +174,21 @@ describe SubmoduleHelper do
expect(result).to eq([expected_path, "#{expected_path}/tree/#{submodule_item.id}"])
end
- it 'handles project under same group' do
- expect_relative_link_to_resolve_to('../test.git', "/#{group.path}/test")
+ it "handles project under same group" do
+ expect_relative_link_to_resolve_to("../test.git", "/#{group.path}/test")
end
- it 'handles trailing whitespace' do
- expect_relative_link_to_resolve_to('../test.git ', "/#{group.path}/test")
+ it "handles trailing whitespace" do
+ expect_relative_link_to_resolve_to("../test.git ", "/#{group.path}/test")
end
- it 'handles project under another top group' do
- expect_relative_link_to_resolve_to('../../baz/test.git ', "/baz/test")
+ it "handles project under another top group" do
+ expect_relative_link_to_resolve_to("../../baz/test.git ", "/baz/test")
end
- context 'repo path resolves to be located at root (namespace absent)' do
- it 'returns nil' do
- allow(repo).to receive(:submodule_url_for).and_return('../../test.git')
+ context "repo path resolves to be located at root (namespace absent)" do
+ it "returns nil" do
+ allow(repo).to receive(:submodule_url_for).and_return("../../test.git")
result = submodule_links(submodule_item)
@@ -196,9 +196,9 @@ describe SubmoduleHelper do
end
end
- context 'repo path resolves to be located underneath current project path' do
- it 'returns nil because it is not possible to have repo nested under another repo' do
- allow(repo).to receive(:submodule_url_for).and_return('./test.git')
+ context "repo path resolves to be located underneath current project path" do
+ it "returns nil because it is not possible to have repo nested under another repo" do
+ allow(repo).to receive(:submodule_url_for).and_return("./test.git")
result = submodule_links(submodule_item)
@@ -206,33 +206,33 @@ describe SubmoduleHelper do
end
end
- context 'subgroup' do
+ context "subgroup" do
let(:sub_group) { create(:group, parent: group, name: "sub group", path: "sub-group") }
let(:sub_project) { create(:project, group: sub_group) }
- context 'project in sub group' do
+ context "project in sub group" do
let(:project) { sub_project }
it "handles referencing ancestor group's project" do
- expect_relative_link_to_resolve_to('../../../top-group/test.git', "/#{group.path}/test")
+ expect_relative_link_to_resolve_to("../../../top-group/test.git", "/#{group.path}/test")
end
end
it "handles referencing descendent group's project" do
- expect_relative_link_to_resolve_to('../sub-group/test.git', "/top-group/sub-group/test")
+ expect_relative_link_to_resolve_to("../sub-group/test.git", "/top-group/sub-group/test")
end
it "handles referencing another top group's project" do
- expect_relative_link_to_resolve_to('../../frontend/css/test.git', "/frontend/css/test")
+ expect_relative_link_to_resolve_to("../../frontend/css/test.git", "/frontend/css/test")
end
end
- context 'personal project' do
+ context "personal project" do
let(:user) { create(:user) }
let(:project) { create(:project, namespace: user.namespace) }
- it 'handles referencing another personal project' do
- expect_relative_link_to_resolve_to('../test.git', "/#{user.username}/test")
+ it "handles referencing another personal project" do
+ expect_relative_link_to_resolve_to("../test.git", "/#{user.username}/test")
end
end
end
View Lorry Controller Status