From 68f1860e6f1f9e8441c434f4e62238c359ce8c7c Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 20 Mar 2020 21:09:17 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/bin/sidekiq_cluster_spec.rb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'spec/bin') diff --git a/spec/bin/sidekiq_cluster_spec.rb b/spec/bin/sidekiq_cluster_spec.rb index 67de55ad9f5..c0240214a6b 100644 --- a/spec/bin/sidekiq_cluster_spec.rb +++ b/spec/bin/sidekiq_cluster_spec.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true require 'spec_helper' +require 'shellwords' describe 'bin/sidekiq-cluster' do using RSpec::Parameterized::TableSyntax @@ -18,9 +19,9 @@ describe 'bin/sidekiq-cluster' do output, status = Gitlab::Popen.popen(cmd, Rails.root.to_s) expect(status).to be(0) - expect(output).to include('"bundle", "exec", "sidekiq"') - expect(output).to include(included) - expect(output).not_to include(excluded) + expect(output).to include('bundle exec sidekiq') + expect(Shellwords.split(output)).to include(included) + expect(Shellwords.split(output)).not_to include(excluded) end end end @@ -36,9 +37,9 @@ describe 'bin/sidekiq-cluster' do output, status = Gitlab::Popen.popen(cmd, Rails.root.to_s) expect(status).to be(0) - expect(output).to include('"bundle", "exec", "sidekiq"') - expect(output).to include('-qdefault,1') - expect(output).to include('-qcronjob:ci_archive_traces_cron,1') + expect(output).to include('bundle exec sidekiq') + expect(Shellwords.split(output)).to include('-qdefault,1') + expect(Shellwords.split(output)).to include('-qcronjob:ci_archive_traces_cron,1') end end end -- cgit v1.2.1