diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /spec/lib/gitlab/patch | |
parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'spec/lib/gitlab/patch')
-rw-r--r-- | spec/lib/gitlab/patch/action_dispatch_journey_formatter_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/patch/draw_route_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/patch/prependable_spec.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/spec/lib/gitlab/patch/action_dispatch_journey_formatter_spec.rb b/spec/lib/gitlab/patch/action_dispatch_journey_formatter_spec.rb index b1c7f73489d..ca74f7573f3 100644 --- a/spec/lib/gitlab/patch/action_dispatch_journey_formatter_spec.rb +++ b/spec/lib/gitlab/patch/action_dispatch_journey_formatter_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Patch::ActionDispatchJourneyFormatter do +RSpec.describe Gitlab::Patch::ActionDispatchJourneyFormatter do let(:group) { create(:group) } let(:project) { create(:project, namespace: group) } let(:pipeline) { create(:ci_empty_pipeline, project: project) } diff --git a/spec/lib/gitlab/patch/draw_route_spec.rb b/spec/lib/gitlab/patch/draw_route_spec.rb index 4009b903dc3..4d1c7bf9fcf 100644 --- a/spec/lib/gitlab/patch/draw_route_spec.rb +++ b/spec/lib/gitlab/patch/draw_route_spec.rb @@ -2,7 +2,7 @@ require 'fast_spec_helper' -describe Gitlab::Patch::DrawRoute do +RSpec.describe Gitlab::Patch::DrawRoute do subject do Class.new do include Gitlab::Patch::DrawRoute diff --git a/spec/lib/gitlab/patch/prependable_spec.rb b/spec/lib/gitlab/patch/prependable_spec.rb index 255324f89d5..8feab57a8f3 100644 --- a/spec/lib/gitlab/patch/prependable_spec.rb +++ b/spec/lib/gitlab/patch/prependable_spec.rb @@ -5,7 +5,7 @@ require 'fast_spec_helper' # Patching ActiveSupport::Concern require_relative '../../../../config/initializers/0_as_concern' -describe Gitlab::Patch::Prependable do +RSpec.describe Gitlab::Patch::Prependable do before do @prepended_modules = [] end |