Rename queue to enqueue in tests

4 files changed, 11 insertions, 7 deletions

diff --git a/Gemfile b/Gemfile
index 8b44b54e22c..9bcfc0302b6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -296,6 +296,7 @@ group :development, :test do
   gem 'spring-commands-rspec',    '~> 1.0.4'
   gem 'spring-commands-spinach',  '~> 1.1.0'
   gem 'spring-commands-teaspoon', '~> 0.0.2'
+  gem "spring-commands-sidekiq"
 
   gem 'rubocop', '~> 0.41.2', require: false
   gem 'rubocop-rspec', '~> 1.5.0', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 3ba6048143c..4bd5b78a047 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -696,6 +696,8 @@ GEM
     spring (1.7.2)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
+    spring-commands-sidekiq (1.0.0)
+      spring (>= 0.9.1)
     spring-commands-spinach (1.1.0)
       spring (>= 0.9.1)
     spring-commands-teaspoon (0.0.2)
@@ -955,6 +957,7 @@ DEPENDENCIES
   spinach-rerun-reporter (~> 0.0.2)
   spring (~> 1.7.0)
   spring-commands-rspec (~> 1.0.4)
+  spring-commands-sidekiq
   spring-commands-spinach (~> 1.1.0)
   spring-commands-teaspoon (~> 0.0.2)
   sprockets (~> 3.6.0)
diff --git a/bin/spring b/bin/spring
index e0d140fe0c7..7fe232c3aae 100755
--- a/bin/spring
+++ b/bin/spring
@@ -3,7 +3,7 @@
 # This file loads spring without using Bundler, in order to be fast.
 # It gets overwritten when you run the `spring binstub` command.
 
-unless (defined?(Spring) || ENV['ENABLE_SPRING'] != '1') && File.basename($0) != 'spring'
+unless defined?(Spring)
   require 'rubygems'
   require 'bundler'
 
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index 19f1aacaabc..8137e9f8f71 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -335,8 +335,8 @@ describe Ci::Pipeline, models: true do
       context 'with multiple builds' do
         context 'when build is queued' do
           before do
-            build_a.queue
-            build_b.queue
+            build_a.enqueue
+            build_b.enqueue
           end
 
           it 'receive a pending event once' do
@@ -346,9 +346,9 @@ describe Ci::Pipeline, models: true do
 
         context 'when build is run' do
           before do
-            build_a.queue
+            build_a.enqueue
             build_a.run
-            build_b.queue
+            build_b.enqueue
             build_b.run
           end
 
@@ -382,8 +382,8 @@ describe Ci::Pipeline, models: true do
       let(:enabled) { false }
 
       before do
-        build_a.queue
-        build_b.queue
+        build_a.enqueue
+        build_b.enqueue
       end
 
       it 'did not execute pipeline_hook after touched' do