summaryrefslogtreecommitdiff
path: root/spec/support/controllers
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2019-07-26 14:57:12 +0000
committerLin Jen-Shin <godfat@godfat.org>2019-07-26 14:57:12 +0000
commitbd1a5a9f422df267725bd5fbd254f3c1f16fd596 (patch)
treec32866892bab7a9aeb2def1d76dafd4a17bcb521 /spec/support/controllers
parent900ef6fc316c7d4024545b5d08598c61fa9f3936 (diff)
parent1ce5bcacdbf56682e05fa63875203bf4d10584bc (diff)
downloadgitlab-ce-bd1a5a9f422df267725bd5fbd254f3c1f16fd596.tar.gz
Merge branch 'remove-nested-groups-checks' into 'master'
Remove code related to object hierarchy and MySQL Closes #65056 and #65055 See merge request gitlab-org/gitlab-ce!31095
Diffstat (limited to 'spec/support/controllers')
-rw-r--r--spec/support/controllers/githubish_import_controller_shared_examples.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/support/controllers/githubish_import_controller_shared_examples.rb b/spec/support/controllers/githubish_import_controller_shared_examples.rb
index 7ddec49bfdf..718d9857b18 100644
--- a/spec/support/controllers/githubish_import_controller_shared_examples.rb
+++ b/spec/support/controllers/githubish_import_controller_shared_examples.rb
@@ -323,7 +323,7 @@ shared_examples 'a GitHub-ish import controller: POST create' do
end
end
- context 'user has chosen an existing nested namespace and name for the project', :postgresql do
+ context 'user has chosen an existing nested namespace and name for the project' do
let(:parent_namespace) { create(:group, name: 'foo') }
let(:nested_namespace) { create(:group, name: 'bar', parent: parent_namespace) }
let(:test_name) { 'test_name' }
@@ -342,7 +342,7 @@ shared_examples 'a GitHub-ish import controller: POST create' do
end
end
- context 'user has chosen a non-existent nested namespaces and name for the project', :postgresql do
+ context 'user has chosen a non-existent nested namespaces and name for the project' do
let(:test_name) { 'test_name' }
it 'takes the selected namespace and name' do
@@ -373,7 +373,7 @@ shared_examples 'a GitHub-ish import controller: POST create' do
end
end
- context 'user has chosen existent and non-existent nested namespaces and name for the project', :postgresql do
+ context 'user has chosen existent and non-existent nested namespaces and name for the project' do
let(:test_name) { 'test_name' }
let!(:parent_namespace) { create(:group, name: 'foo') }