Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
67ff702c
Commit
67ff702c
authored
Apr 12, 2021
by
Abdul Wadood
Committed by
Markus Koller
Apr 12, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix RSpec/EmptyLineAfterFinalLetItBe for ee/spec/services/merge_trains
parent
3bc07e26
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
4 deletions
+9
-4
.rubocop_manual_todo.yml
.rubocop_manual_todo.yml
+0
-4
ee/changelogs/unreleased/rspec-empty-lines-after-letitbe-ee-spec-merge-trains.yml
.../rspec-empty-lines-after-letitbe-ee-spec-merge-trains.yml
+5
-0
ee/spec/services/merge_trains/check_status_service_spec.rb
ee/spec/services/merge_trains/check_status_service_spec.rb
+1
-0
ee/spec/services/merge_trains/create_pipeline_service_spec.rb
...pec/services/merge_trains/create_pipeline_service_spec.rb
+1
-0
ee/spec/services/merge_trains/refresh_merge_request_service_spec.rb
...rvices/merge_trains/refresh_merge_request_service_spec.rb
+1
-0
ee/spec/services/merge_trains/refresh_service_spec.rb
ee/spec/services/merge_trains/refresh_service_spec.rb
+1
-0
No files found.
.rubocop_manual_todo.yml
View file @
67ff702c
...
...
@@ -608,10 +608,6 @@ RSpec/EmptyLineAfterFinalLetItBe:
-
ee/spec/services/incident_management/incidents/upload_metric_service_spec.rb
-
ee/spec/services/incident_management/oncall_rotations/edit_service_spec.rb
-
ee/spec/services/merge_request_approval_settings/update_service_spec.rb
-
ee/spec/services/merge_trains/check_status_service_spec.rb
-
ee/spec/services/merge_trains/create_pipeline_service_spec.rb
-
ee/spec/services/merge_trains/refresh_merge_request_service_spec.rb
-
ee/spec/services/merge_trains/refresh_service_spec.rb
-
ee/spec/services/personal_access_tokens/create_service_audit_log_spec.rb
-
ee/spec/services/personal_access_tokens/groups/update_lifetime_service_spec.rb
-
ee/spec/services/projects/after_rename_service_spec.rb
...
...
ee/changelogs/unreleased/rspec-empty-lines-after-letitbe-ee-spec-merge-trains.yml
0 → 100644
View file @
67ff702c
---
title
:
Fix RSpec/EmptyLineAfterFinalLetItBe rubocop offenses in ee/spec/services/merge_trains
merge_request
:
58333
author
:
Abdul Wadood @abdulwd
type
:
fixed
ee/spec/services/merge_trains/check_status_service_spec.rb
View file @
67ff702c
...
...
@@ -5,6 +5,7 @@ require 'spec_helper'
RSpec
.
describe
MergeTrains
::
CheckStatusService
do
let_it_be
(
:project
)
{
create
(
:project
,
:repository
,
merge_pipelines_enabled:
true
,
merge_trains_enabled:
true
)
}
let_it_be
(
:maintainer
)
{
create
(
:user
).
tap
{
|
u
|
project
.
add_maintainer
(
u
)}
}
let
(
:service
)
{
described_class
.
new
(
project
,
maintainer
)
}
let
(
:previous_ref
)
{
'refs/heads/master'
}
...
...
ee/spec/services/merge_trains/create_pipeline_service_spec.rb
View file @
67ff702c
...
...
@@ -5,6 +5,7 @@ require 'spec_helper'
RSpec
.
describe
MergeTrains
::
CreatePipelineService
do
let_it_be
(
:project
)
{
create
(
:project
,
:repository
,
:auto_devops
,
merge_pipelines_enabled:
true
,
merge_trains_enabled:
true
)
}
let_it_be
(
:maintainer
)
{
create
(
:user
)
}
let
(
:service
)
{
described_class
.
new
(
project
,
maintainer
)
}
let
(
:previous_ref
)
{
'refs/heads/master'
}
...
...
ee/spec/services/merge_trains/refresh_merge_request_service_spec.rb
View file @
67ff702c
...
...
@@ -5,6 +5,7 @@ require 'spec_helper'
RSpec
.
describe
MergeTrains
::
RefreshMergeRequestService
do
let_it_be
(
:project
)
{
create
(
:project
,
:repository
,
merge_pipelines_enabled:
true
,
merge_trains_enabled:
true
)
}
let_it_be
(
:maintainer
)
{
create
(
:user
)
}
let
(
:service
)
{
described_class
.
new
(
project
,
maintainer
,
require_recreate:
require_recreate
)
}
let
(
:require_recreate
)
{
false
}
...
...
ee/spec/services/merge_trains/refresh_service_spec.rb
View file @
67ff702c
...
...
@@ -8,6 +8,7 @@ RSpec.describe MergeTrains::RefreshService do
let
(
:project
)
{
create
(
:project
)
}
let_it_be
(
:maintainer_1
)
{
create
(
:user
)
}
let_it_be
(
:maintainer_2
)
{
create
(
:user
)
}
let
(
:service
)
{
described_class
.
new
(
project
,
maintainer_1
)
}
before
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment