diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 12:16:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 12:16:11 +0300 |
| commit | edaa33dee2ff2f7ea3fac488d41558eb5f86d68c (patch) | |
| tree | 11f143effbfeba52329fb7afbd05e6e2a3790241 /spec/config | |
| parent | d8a5691316400a0f7ec4f83832698f1988eb27c1 (diff) | |
Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42
Diffstat (limited to 'spec/config')
| -rw-r--r-- | spec/config/inject_enterprise_edition_module_spec.rb | 2 | ||||
| -rw-r--r-- | spec/config/mail_room_spec.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/spec/config/inject_enterprise_edition_module_spec.rb b/spec/config/inject_enterprise_edition_module_spec.rb index 61b40e46001..6ef74a2b616 100644 --- a/spec/config/inject_enterprise_edition_module_spec.rb +++ b/spec/config/inject_enterprise_edition_module_spec.rb @@ -11,7 +11,7 @@ RSpec.describe InjectEnterpriseEditionModule do before do # Make sure we're not relying on which mode we're running under - allow(Gitlab).to receive(:extensions).and_return([extension_name.downcase]) + allow(GitlabEdition).to receive(:extensions).and_return([extension_name.downcase]) # Test on an imagined extension and imagined class stub_const(fish_name, fish_class) # Fish diff --git a/spec/config/mail_room_spec.rb b/spec/config/mail_room_spec.rb index 55f8fdd78ba..ec306837361 100644 --- a/spec/config/mail_room_spec.rb +++ b/spec/config/mail_room_spec.rb @@ -18,8 +18,9 @@ RSpec.describe 'mail_room.yml' do result = Gitlab::Popen.popen_with_detail(%W(ruby -rerb -e #{cmd}), absolute_path('config'), vars) output = result.stdout + errors = result.stderr status = result.status - raise "Error interpreting #{mailroom_config_path}: #{output}" unless status == 0 + raise "Error interpreting #{mailroom_config_path}: #{output}\n#{errors}" unless status == 0 YAML.safe_load(output, permitted_classes: [Symbol]) end |