Add latest changes from gitlab-org/gitlab@master

1 files changed, 13 insertions, 2 deletions

diff --git a/spec/tasks/gitlab/container_registry_rake_spec.rb b/spec/tasks/gitlab/container_registry_rake_spec.rb
index 41fc348aa24..181d5c8b7c8 100644
--- a/spec/tasks/gitlab/container_registry_rake_spec.rb
+++ b/spec/tasks/gitlab/container_registry_rake_spec.rb
@@ -16,10 +16,21 @@ describe 'gitlab:container_registry namespace rake tasks' do
       stub_container_registry_config(enabled: true, api_url: api_url)
     end
 
+    subject { run_rake_task('gitlab:container_registry:configure') }
+
     shared_examples 'invalid config' do
       it 'does not update the application settings' do
-        expect { run_rake_task('gitlab:container_registry:configure') }
-          .to raise_error(/Registry is not enabled or registry api url is not present./)
+        expect(application_settings).not_to receive(:update!)
+
+        subject
+      end
+
+      it 'does not raise an error' do
+        expect { subject }.not_to raise_error
+      end
+
+      it 'prints a warning message' do
+        expect { subject }.to output(/Registry is not enabled or registry api url is not present./).to_stdout
       end
     end