Merge branch 'master' into sh-headless-chrome-support

3 files changed, 60 insertions, 41 deletions

diff --git a/spec/features/explore/new_menu_spec.rb b/spec/features/explore/new_menu_spec.rb
index d570b0afe6e..3e386a06c97 100644
--- a/spec/features/explore/new_menu_spec.rb
+++ b/spec/features/explore/new_menu_spec.rb
@@ -74,7 +74,7 @@ feature 'Top Plus Menu', :js do
       expect(page).to have_content('Title')
     end
 
-    scenario 'Click on New subgroup shows new group page' do
+    scenario 'Click on New subgroup shows new group page', :nested_groups do
       visit group_path(group)
 
       click_topmenuitem("New subgroup")
diff --git a/spec/features/groups_spec.rb b/spec/features/groups_spec.rb
index e59a484d992..20f9818b08b 100644
--- a/spec/features/groups_spec.rb
+++ b/spec/features/groups_spec.rb
@@ -104,18 +104,15 @@ feature 'Group' do
     end
 
     context 'as group owner' do
-      let(:user) { create(:user) }
+      it 'creates a nested group' do
+        user = create(:user)
 
-      before do
         group.add_owner(user)
         sign_out(:user)
         sign_in(user)
 
         visit subgroups_group_path(group)
         click_link 'New Subgroup'
-      end
-
-      it 'creates a nested group' do
         fill_in 'Group path', with: 'bar'
         click_button 'Create group'
 
@@ -123,6 +120,16 @@ feature 'Group' do
         expect(page).to have_content("Group 'bar' was successfully created.")
       end
     end
+
+    context 'when nested group feature is disabled' do
+      it 'renders 404' do
+        allow(Group).to receive(:supports_nested_groups?).and_return(false)
+
+        visit subgroups_group_path(group)
+
+        expect(page.status_code).to eq(404)
+      end
+    end
   end
 
   it 'checks permissions to avoid exposing groups by parent_id' do
diff --git a/spec/features/projects/import_export/import_file_spec.rb b/spec/features/projects/import_export/import_file_spec.rb
index 6a324d32ca7..9f2c86923b7 100644
--- a/spec/features/projects/import_export/import_file_spec.rb
+++ b/spec/features/projects/import_export/import_file_spec.rb
@@ -3,11 +3,13 @@ require 'spec_helper'
 feature 'Import/Export - project import integration test', js: true do
   include Select2Helper
 
+  let(:user) { create(:user) }
   let(:file) { File.join(Rails.root, 'spec', 'features', 'projects', 'import_export', 'test_project_export.tar.gz') }
   let(:export_path) { "#{Dir.tmpdir}/import_file_spec" }
 
   background do
     allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path)
+    gitlab_sign_in(user)
   end
 
   after do
@@ -18,57 +20,67 @@ feature 'Import/Export - project import integration test', js: true do
     let(:user) { create(:admin) }
     let!(:namespace) { create(:namespace, name: "asd", owner: user) }
 
-    before do
-      gitlab_sign_in(user)
-    end
+    context 'prefilled the path' do
+      scenario 'user imports an exported project successfully' do
+        visit new_project_path
 
-    scenario 'user imports an exported project successfully' do
-      visit new_project_path
+        select2(namespace.id, from: '#project_namespace_id')
+        fill_in :project_path, with: 'test-project-path', visible: true
+        click_link 'GitLab export'
 
-      select2(namespace.id, from: '#project_namespace_id')
-      fill_in :project_path, with: 'test-project-path', visible: true
-      click_link 'GitLab export'
+        expect(page).to have_content('Import an exported GitLab project')
+        expect(URI.parse(current_url).query).to eq("namespace_id=#{namespace.id}&path=test-project-path")
+        expect(Gitlab::ImportExport).to receive(:import_upload_path).with(filename: /\A\h{32}_test-project-path\z/).and_call_original
 
-      expect(page).to have_content('Import an exported GitLab project')
-      expect(URI.parse(current_url).query).to eq("namespace_id=#{namespace.id}&path=test-project-path")
-      expect(Gitlab::ImportExport).to receive(:import_upload_path).with(filename: /\A\h{32}_test-project-path\z/).and_call_original
+        attach_file('file', file)
 
-      attach_file('file', file)
+        expect { click_on 'Import project' }.to change { Project.count }.by(1)
 
-      expect { click_on 'Import project' }.to change { Project.count }.from(0).to(1)
-
-      project = Project.last
-      expect(project).not_to be_nil
-      expect(project.issues).not_to be_empty
-      expect(project.merge_requests).not_to be_empty
-      expect(project_hook_exists?(project)).to be true
-      expect(wiki_exists?(project)).to be true
-      expect(project.import_status).to eq('finished')
+        project = Project.last
+        expect(project).not_to be_nil
+        expect(project.issues).not_to be_empty
+        expect(project.merge_requests).not_to be_empty
+        expect(project_hook_exists?(project)).to be true
+        expect(wiki_exists?(project)).to be true
+        expect(project.import_status).to eq('finished')
+      end
     end
 
-    scenario 'invalid project' do
-      project = create(:project, namespace: namespace)
+    context 'path is not prefilled' do
+      scenario 'user imports an exported project successfully' do
+        visit new_project_path
+        click_link 'GitLab export'
 
-      visit new_project_path
+        fill_in :path, with: 'test-project-path', visible: true
+        attach_file('file', file)
 
-      select2(namespace.id, from: '#project_namespace_id')
-      fill_in :project_path, with: project.name, visible: true
-      click_link 'GitLab export'
-      attach_file('file', file)
-      click_on 'Import project'
+        expect { click_on 'Import project' }.to change { Project.count }.by(1)
 
-      page.within('.flash-container') do
-        expect(page).to have_content('Project could not be imported')
+        project = Project.last
+        expect(project).not_to be_nil
+        expect(page).to have_content("Project 'test-project-path' is being imported")
       end
     end
   end
 
-  context 'when limited to the default user namespace' do
-    let(:user) { create(:user) }
-    before do
-      gitlab_sign_in(user)
+  scenario 'invalid project' do
+    namespace = create(:namespace, name: "asd", owner: user)
+    project = create(:project, namespace: namespace)
+
+    visit new_project_path
+
+    select2(namespace.id, from: '#project_namespace_id')
+    fill_in :project_path, with: project.name, visible: true
+    click_link 'GitLab export'
+    attach_file('file', file)
+    click_on 'Import project'
+
+    page.within('.flash-container') do
+      expect(page).to have_content('Project could not be imported')
     end
+  end
 
+  context 'when limited to the default user namespace' do
     scenario 'passes correct namespace ID in the URL' do
       visit new_project_path