2 files changed, 13 insertions, 17 deletions
diff --git a/spec/support/shared_examples/controllers/environments_controller_shared_examples.rb b/spec/support/shared_examples/controllers/environments_controller_shared_examples.rb
index a79b94209f3..c6e880635aa 100644
--- a/spec/support/shared_examples/controllers/environments_controller_shared_examples.rb
+++ b/spec/support/shared_examples/controllers/environments_controller_shared_examples.rb
@@ -65,20 +65,3 @@ RSpec.shared_examples 'failed response for #cancel_auto_stop' do
     end
   end
 end
-
-RSpec.shared_examples 'avoids N+1 queries on environment detail page' do
-  render_views
-
-  before do
-    create_deployment_with_associations(sequence: 0)
-  end
-
-  it 'avoids N+1 queries' do
-    control = ActiveRecord::QueryRecorder.new { get :show, params: environment_params }
-
-    create_deployment_with_associations(sequence: 1)
-    create_deployment_with_associations(sequence: 2)
-
-    expect { get :show, params: environment_params }.not_to exceed_query_limit(control.count).with_threshold(34)
-  end
-end
diff --git a/spec/support/shared_examples/controllers/githubish_import_controller_shared_examples.rb b/spec/support/shared_examples/controllers/githubish_import_controller_shared_examples.rb
index 2ea98002de1..5faf462c23c 100644
--- a/spec/support/shared_examples/controllers/githubish_import_controller_shared_examples.rb
+++ b/spec/support/shared_examples/controllers/githubish_import_controller_shared_examples.rb
@@ -36,6 +36,19 @@ RSpec.shared_examples 'a GitHub-ish import controller: POST personal_access_toke
     expect(session[:"#{provider}_access_token"]).to eq(token)
     expect(controller).to redirect_to(status_import_url)
   end
+
+  it 'passes namespace_id param as query param if it was present' do
+    namespace_id = 5
+    status_import_url = public_send("status_import_#{provider}_url", { namespace_id: namespace_id })
+
+    allow_next_instance_of(Gitlab::LegacyGithubImport::Client) do |client|
+      allow(client).to receive(:user).and_return(true)
+    end
+
+    post :personal_access_token, params: { personal_access_token: 'some-token', namespace_id: 5 }
+
+    expect(controller).to redirect_to(status_import_url)
+  end
 end
 
 RSpec.shared_examples 'a GitHub-ish import controller: GET new' do