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
925c9d7e
Commit
925c9d7e
authored
Nov 01, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add accept_confirm around actions which require it
parent
5f2cb53d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
spec/ee/spec/features/projects/settings/merge_requests_settings_spec.rb
...eatures/projects/settings/merge_requests_settings_spec.rb
+1
-1
spec/features/merge_requests/approvals_spec.rb
spec/features/merge_requests/approvals_spec.rb
+2
-2
spec/features/projects/mirror_spec.rb
spec/features/projects/mirror_spec.rb
+1
-1
spec/features/projects/path_locks_spec.rb
spec/features/projects/path_locks_spec.rb
+1
-1
No files found.
spec/ee/spec/features/projects/settings/merge_requests_settings_spec.rb
View file @
925c9d7e
...
...
@@ -77,7 +77,7 @@ describe 'Project settings > [EE] Merge Requests', :js do
expect
(
find
(
'.js-current-approvers'
)).
to
have_content
(
group
.
name
)
within
(
'.js-current-approvers'
)
do
click_on
"Remove"
accept_confirm
{
click_on
"Remove"
}
end
expect
(
find
(
'.js-current-approvers'
)).
not_to
have_content
(
group
.
name
)
...
...
spec/features/merge_requests/approvals_spec.rb
View file @
925c9d7e
...
...
@@ -98,7 +98,7 @@ feature 'Merge request approvals', :js do
visit
project_new_merge_request_path
(
project
,
merge_request:
{
target_branch:
'master'
,
source_branch:
'feature'
})
within
(
'.approver-list li.approver-group'
)
do
click_on
"Remove"
accept_confirm
{
click_on
"Remove"
}
end
expect
(
page
).
to
have_css
(
'.approver-list li'
,
count:
1
)
...
...
@@ -153,7 +153,7 @@ feature 'Merge request approvals', :js do
visit
edit_project_merge_request_path
(
project
,
merge_request
)
within
(
'.approver-list li.approver-group'
)
do
click_on
"Remove"
accept_confirm
{
click_on
"Remove"
}
end
expect
(
page
).
to
have_css
(
'.approver-list li'
,
count:
1
)
...
...
spec/features/projects/mirror_spec.rb
View file @
925c9d7e
...
...
@@ -143,7 +143,7 @@ feature 'Project mirror', :js do
expect
(
page
).
to
have_content
(
first_key
)
# Check regenerating the public key works
click_without_sidekiq
'Regenerate key'
accept_confirm
{
click_without_sidekiq
'Regenerate key'
}
wait_for_requests
expect
(
page
).
not_to
have_content
(
first_key
)
...
...
spec/features/projects/path_locks_spec.rb
View file @
925c9d7e
...
...
@@ -73,7 +73,7 @@ feature 'Path Locks', :js do
within
'.locks'
do
expect
(
page
).
to
have_content
(
'encoding'
)
find
(
'.btn-remove'
).
click
accept_confirm
{
find
(
'.btn-remove'
).
click
}
expect
(
page
).
not_to
have_content
(
'encoding'
)
end
...
...
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