diff options
| author | blackst0ne <blackst0ne.ru@gmail.com> | 2018-12-07 17:40:24 +1100 |
|---|---|---|
| committer | blackst0ne <blackst0ne.ru@gmail.com> | 2018-12-18 11:12:17 +1100 |
| commit | bbe0c7b53d261a6be3b96b245581006bf212e846 (patch) | |
| tree | 47f78d5fdeaea5f09bfe1bc39f55c7f0e0f49026 | |
| parent | 6964e510534c1d08fd730918ba3b9581dbd679a6 (diff) | |
| download | gitlab-ce-blackst0ne-make-sidekiq-testing-fake-default.tar.gz | |
Make 'Sidekiq::Testing.fake!' mode as defaultblackst0ne-make-sidekiq-testing-fake-default
| -rw-r--r-- | changelogs/unreleased/blackst0ne-make-sidekiq-testing-fake-default.yml | 5 | ||||
| -rw-r--r-- | spec/controllers/projects/mirrors_controller_spec.rb | 4 | ||||
| -rw-r--r-- | spec/support/sidekiq.rb | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/changelogs/unreleased/blackst0ne-make-sidekiq-testing-fake-default.yml b/changelogs/unreleased/blackst0ne-make-sidekiq-testing-fake-default.yml new file mode 100644 index 00000000000..8bf94f22dd3 --- /dev/null +++ b/changelogs/unreleased/blackst0ne-make-sidekiq-testing-fake-default.yml @@ -0,0 +1,5 @@ +--- +title: Make 'Sidekiq::Testing.fake!' mode as default +merge_request: 20769 +author: "@blackst0ne" +type: other diff --git a/spec/controllers/projects/mirrors_controller_spec.rb b/spec/controllers/projects/mirrors_controller_spec.rb index 976f480930c..b107d9a430a 100644 --- a/spec/controllers/projects/mirrors_controller_spec.rb +++ b/spec/controllers/projects/mirrors_controller_spec.rb @@ -49,10 +49,6 @@ describe Projects::MirrorsController do sign_in(project.owner) end - around do |example| - Sidekiq::Testing.fake! { example.run } - end - context 'With valid URL for a push' do let(:remote_mirror_attributes) do { "0" => { "enabled" => "0", url: 'https://updated.example.com' } } diff --git a/spec/support/sidekiq.rb b/spec/support/sidekiq.rb index 6c4e11910d3..a875a789283 100644 --- a/spec/support/sidekiq.rb +++ b/spec/support/sidekiq.rb @@ -1,4 +1,4 @@ -require 'sidekiq/testing/inline' +require 'sidekiq/testing' # If Sidekiq::Testing.inline! is used, SQL transactions done inside # Sidekiq worker are included in the SQL query limit (in a real |