diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-11 21:05:59 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-11 21:05:59 +0000 |
commit | ac062237da66db75b22f5dab2cc5766ee62a44d1 (patch) | |
tree | ae5a7eb248ddbf5c8c32c29a269127a936356364 /spec/spec_helper.rb | |
parent | 0dfbcd8f8b1587a7e10eb79940a8dc13bd72c664 (diff) | |
download | gitlab-ce-ac062237da66db75b22f5dab2cc5766ee62a44d1.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r-- | spec/spec_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index bf87c078ac6..948e5e6250b 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -90,7 +90,7 @@ RSpec.configure do |config| config.include StubFeatureFlags config.include StubGitlabCalls config.include StubGitlabData - config.include ExpectNextInstanceOf + config.include NextInstanceOf config.include TestEnv config.include Devise::Test::ControllerHelpers, type: :controller config.include Devise::Test::IntegrationHelpers, type: :feature |