diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-15 03:07:23 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-15 03:07:23 +0300 |
| commit | afd8f58f2d0d42d21496fe4652c1664add9b68b7 (patch) | |
| tree | 38741f62cac6fafb42d30632596db951ec955850 /spec/support | |
| parent | beabc7d164276a8bb35c2b497a0c4dc0dc824e3c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/finder_collection_allowlist.yml | 1 | ||||
| -rw-r--r-- | spec/support/view_component.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/spec/support/finder_collection_allowlist.yml b/spec/support/finder_collection_allowlist.yml index 8fcb4ee7b9c..7ac7e88867a 100644 --- a/spec/support/finder_collection_allowlist.yml +++ b/spec/support/finder_collection_allowlist.yml @@ -5,6 +5,7 @@ # FooFinder # Reason: It uses a memory backend - Namespaces::BilledUsersFinder # Reason: There is no need to have anything else besides the ids is current structure - Namespaces::FreeUserCap::UsersFinder # Reason: There is no need to have anything else besides the count +- Groups::EnvironmentScopesFinder # Reason: There is no need to have anything else besides the simple strucutre with the scope name # Temporary excludes (aka TODOs) # For example: diff --git a/spec/support/view_component.rb b/spec/support/view_component.rb index 912bfda6d33..cddd39bbb1e 100644 --- a/spec/support/view_component.rb +++ b/spec/support/view_component.rb @@ -7,7 +7,7 @@ RSpec.configure do |config| config.include Devise::Test::ControllerHelpers, type: :component config.before(:each, type: :component) do - @request = controller.request + @request = vc_test_controller.request end config.include_context 'when page has no HTML escapes', type: :component |