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
af2a4248
Commit
af2a4248
authored
Mar 30, 2021
by
Marcin Sedlak-Jakubowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix merge trains spec
parent
cad5dbbc
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
ee/spec/features/projects/settings/disable_merge_trains_setting_spec.rb
...es/projects/settings/disable_merge_trains_setting_spec.rb
+3
-3
No files found.
ee/spec/features/projects/settings/disable_merge_trains_setting_spec.rb
View file @
af2a4248
...
@@ -54,7 +54,7 @@ RSpec.describe 'Disable Merge Trains Setting', :js do
...
@@ -54,7 +54,7 @@ RSpec.describe 'Disable Merge Trains Setting', :js do
include_examples
'loads correct checkbox state'
include_examples
'loads correct checkbox state'
it
"checking merge trains checkbox doesn't affect merge pipelines checkbox"
do
it
"checking merge trains checkbox doesn't affect merge pipelines checkbox"
do
check
(
'Enable merge trains
.
'
)
check
(
'Enable merge trains'
)
expect
(
find
(
'#project_merge_trains_enabled'
)).
to
be_checked
expect
(
find
(
'#project_merge_trains_enabled'
)).
to
be_checked
expect
(
find
(
'#project_merge_pipelines_enabled'
)).
not_to
be_disabled
expect
(
find
(
'#project_merge_pipelines_enabled'
)).
not_to
be_disabled
...
@@ -69,7 +69,7 @@ RSpec.describe 'Disable Merge Trains Setting', :js do
...
@@ -69,7 +69,7 @@ RSpec.describe 'Disable Merge Trains Setting', :js do
end
end
it
'unchecking merge pipelines checkbox unchecks merge trains checkbox if it was previously checked'
do
it
'unchecking merge pipelines checkbox unchecks merge trains checkbox if it was previously checked'
do
check
(
'Enable merge trains
.
'
)
check
(
'Enable merge trains'
)
uncheck
(
'Enable merged results pipelines'
)
uncheck
(
'Enable merged results pipelines'
)
expect
(
find
(
'#project_merge_pipelines_enabled'
)).
not_to
be_checked
expect
(
find
(
'#project_merge_pipelines_enabled'
)).
not_to
be_checked
...
@@ -120,7 +120,7 @@ RSpec.describe 'Disable Merge Trains Setting', :js do
...
@@ -120,7 +120,7 @@ RSpec.describe 'Disable Merge Trains Setting', :js do
end
end
it
"unchecking merge trains checkbox doesn't affect merge pipelines checkbox"
do
it
"unchecking merge trains checkbox doesn't affect merge pipelines checkbox"
do
uncheck
(
'Enable merge trains
.
'
)
uncheck
(
'Enable merge trains'
)
expect
(
find
(
'#project_merge_trains_enabled'
)).
not_to
be_checked
expect
(
find
(
'#project_merge_trains_enabled'
)).
not_to
be_checked
expect
(
find
(
'#project_merge_pipelines_enabled'
)).
not_to
be_disabled
expect
(
find
(
'#project_merge_pipelines_enabled'
)).
not_to
be_disabled
...
...
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