summaryrefslogtreecommitdiff
path: root/spec/controllers/concerns
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-20 00:09:29 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-20 00:09:29 +0000
commitb060b8b7e4e895e28226b366b92081512225cd14 (patch)
tree0364ce1045b2e0a1cc3cad7b0d487e254335b66c /spec/controllers/concerns
parent49a923c646a2c24b5377cfde8236c73094c60d42 (diff)
downloadgitlab-ce-b060b8b7e4e895e28226b366b92081512225cd14.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/concerns')
-rw-r--r--spec/controllers/concerns/import_url_params_spec.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/controllers/concerns/import_url_params_spec.rb b/spec/controllers/concerns/import_url_params_spec.rb
index adbe6e5d3bf..41e29d71386 100644
--- a/spec/controllers/concerns/import_url_params_spec.rb
+++ b/spec/controllers/concerns/import_url_params_spec.rb
@@ -31,7 +31,8 @@ describe ImportUrlParams do
describe '#import_url_params' do
it 'returns hash with import_url' do
expect(import_url_params).to eq(
- import_url: "https://user:password@url.com"
+ import_url: "https://user:password@url.com",
+ import_type: 'git'
)
end
end
@@ -48,7 +49,8 @@ describe ImportUrlParams do
describe '#import_url_params' do
it 'does not change the url' do
expect(import_url_params).to eq(
- import_url: "https://user:password@url.com"
+ import_url: "https://user:password@url.com",
+ import_type: 'git'
)
end
end