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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
7a5c2d5e
Commit
7a5c2d5e
authored
Oct 02, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Element is not clickable at this point
parent
bd2822ce
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
14 deletions
+14
-14
spec/features/issues/bulk_assignment_labels_spec.rb
spec/features/issues/bulk_assignment_labels_spec.rb
+1
-1
spec/features/merge_requests/conflicts_spec.rb
spec/features/merge_requests/conflicts_spec.rb
+3
-3
spec/features/merge_requests/diff_notes_avatars_spec.rb
spec/features/merge_requests/diff_notes_avatars_spec.rb
+7
-7
spec/features/projects/settings/merge_requests_settings_spec.rb
...eatures/projects/settings/merge_requests_settings_spec.rb
+3
-3
No files found.
spec/features/issues/bulk_assignment_labels_spec.rb
View file @
7a5c2d5e
...
...
@@ -405,7 +405,7 @@ feature 'Issues > Labels bulk assignment' do
end
def
update_issues
find
(
'.update-selected-issues'
).
trigger
(
'click'
)
find
(
'.update-selected-issues'
).
send_keys
(
:return
)
wait_for_requests
end
...
...
spec/features/merge_requests/conflicts_spec.rb
View file @
7a5c2d5e
...
...
@@ -23,11 +23,11 @@ feature 'Merge request conflict resolution', js: true do
within
find
(
'.files-wrapper .diff-file'
,
text:
'files/ruby/regex.rb'
)
do
all
(
'button'
,
text:
'Use ours'
).
each
do
|
button
|
button
.
click
button
.
send_keys
(
:return
)
end
end
click_button
'Commit conflict resolution'
find_button
(
'Commit conflict resolution'
).
send_keys
(
:return
)
expect
(
page
).
to
have_content
(
'All merge conflicts were resolved'
)
merge_request
.
reload_diff
...
...
@@ -69,7 +69,7 @@ feature 'Merge request conflict resolution', js: true do
execute_script
(
'ace.edit($(".files-wrapper .diff-file pre")[1]).setValue("Gregor Samsa woke from troubled dreams");'
)
end
click_button
'Commit conflict resolution'
find_button
(
'Commit conflict resolution'
).
send_keys
(
:return
)
expect
(
page
).
to
have_content
(
'All merge conflicts were resolved'
)
merge_request
.
reload_diff
...
...
spec/features/merge_requests/diff_notes_avatars_spec.rb
View file @
7a5c2d5e
...
...
@@ -86,7 +86,7 @@ feature 'Diff note avatars', js: true do
it
'shows note avatar'
do
page
.
within
find
(
"[id='
#{
position
.
line_code
(
project
.
repository
)
}
']"
)
do
find
(
'.diff-notes-collapse'
).
click
find
(
'.diff-notes-collapse'
).
send_keys
(
:return
)
expect
(
page
).
to
have_selector
(
'img.js-diff-comment-avatar'
,
count:
1
)
end
...
...
@@ -94,7 +94,7 @@ feature 'Diff note avatars', js: true do
it
'shows comment on note avatar'
do
page
.
within
find
(
"[id='
#{
position
.
line_code
(
project
.
repository
)
}
']"
)
do
find
(
'.diff-notes-collapse'
).
click
find
(
'.diff-notes-collapse'
).
send_keys
(
:return
)
expect
(
first
(
'img.js-diff-comment-avatar'
)[
"data-original-title"
]).
to
eq
(
"
#{
note
.
author
.
name
}
:
#{
note
.
note
.
truncate
(
17
)
}
"
)
end
...
...
@@ -102,13 +102,13 @@ feature 'Diff note avatars', js: true do
it
'toggles comments when clicking avatar'
do
page
.
within
find
(
"[id='
#{
position
.
line_code
(
project
.
repository
)
}
']"
)
do
find
(
'.diff-notes-collapse'
).
click
find
(
'.diff-notes-collapse'
).
send_keys
(
:return
)
end
expect
(
page
).
to
have_selector
(
'.notes_holder'
,
visible:
false
)
page
.
within
find
(
"[id='
#{
position
.
line_code
(
project
.
repository
)
}
']"
)
do
first
(
'img.js-diff-comment-avatar'
).
click
first
(
'img.js-diff-comment-avatar'
).
send_keys
(
:return
)
end
expect
(
page
).
to
have_selector
(
'.notes_holder'
)
...
...
@@ -140,7 +140,7 @@ feature 'Diff note avatars', js: true do
end
page
.
within
find
(
"[id='
#{
position
.
line_code
(
project
.
repository
)
}
']"
)
do
find
(
'.diff-notes-collapse'
).
trigger
(
'click'
)
find
(
'.diff-notes-collapse'
).
send_keys
(
:return
)
expect
(
page
).
to
have_selector
(
'img.js-diff-comment-avatar'
,
count:
2
)
end
...
...
@@ -160,7 +160,7 @@ feature 'Diff note avatars', js: true do
end
page
.
within
find
(
"[id='
#{
position
.
line_code
(
project
.
repository
)
}
']"
)
do
find
(
'.diff-notes-collapse'
).
click
find
(
'.diff-notes-collapse'
).
send_keys
(
:return
)
expect
(
page
).
to
have_selector
(
'img.js-diff-comment-avatar'
,
count:
3
)
expect
(
find
(
'.diff-comments-more-count'
)).
to
have_content
'+1'
...
...
@@ -178,7 +178,7 @@ feature 'Diff note avatars', js: true do
it
'shows extra comment count'
do
page
.
within
find
(
"[id='
#{
position
.
line_code
(
project
.
repository
)
}
']"
)
do
find
(
'.diff-notes-collapse'
).
click
find
(
'.diff-notes-collapse'
).
send_keys
(
:return
)
expect
(
find
(
'.diff-comments-more-count'
)).
to
have_content
'+1'
end
...
...
spec/features/projects/settings/merge_requests_settings_spec.rb
View file @
7a5c2d5e
...
...
@@ -21,7 +21,7 @@ feature 'Project settings > Merge Requests', :js do
within
(
'.sharing-permissions-form'
)
do
find
(
'.project-feature-controls[data-for="project[project_feature_attributes][merge_requests_access_level]"] .project-feature-toggle'
).
click
click_on
(
'Save changes'
)
find
(
'input[value="Save changes"]'
).
send_keys
(
:return
)
end
expect
(
page
).
not_to
have_content
(
'Only allow merge requests to be merged if the pipeline succeeds'
)
...
...
@@ -41,7 +41,7 @@ feature 'Project settings > Merge Requests', :js do
within
(
'.sharing-permissions-form'
)
do
find
(
'.project-feature-controls[data-for="project[project_feature_attributes][builds_access_level]"] .project-feature-toggle'
).
click
click_on
(
'Save changes'
)
find
(
'input[value="Save changes"]'
).
send_keys
(
:return
)
end
expect
(
page
).
to
have_content
(
'Only allow merge requests to be merged if the pipeline succeeds'
)
...
...
@@ -62,7 +62,7 @@ feature 'Project settings > Merge Requests', :js do
within
(
'.sharing-permissions-form'
)
do
find
(
'.project-feature-controls[data-for="project[project_feature_attributes][merge_requests_access_level]"] .project-feature-toggle'
).
click
click_on
(
'Save changes'
)
find
(
'input[value="Save changes"]'
).
send_keys
(
:return
)
end
expect
(
page
).
to
have_content
(
'Only allow merge requests to be merged if the pipeline succeeds'
)
...
...
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