BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
3dd1efe6
Commit
3dd1efe6
authored
Aug 28, 2017
by
Robert Speicher
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-flakes' into 'master'
fix transient dropdown test failures Closes #37052 and #34436 See merge request !13862
parents
7ccef75a
bcd2135e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
notes_on_personal_snippets_spec.rb
spec/features/snippets/notes_on_personal_snippets_spec.rb
+1
-1
reportable_note_shared_examples.rb
spec/support/features/reportable_note_shared_examples.rb
+1
-1
note_interaction_helpers.rb
spec/support/helpers/note_interaction_helpers.rb
+1
-1
No files found.
spec/features/snippets/notes_on_personal_snippets_spec.rb
View file @
3dd1efe6
...
@@ -91,7 +91,7 @@ describe 'Comments on personal snippets', :js do
...
@@ -91,7 +91,7 @@ describe 'Comments on personal snippets', :js do
context
'when editing a note'
do
context
'when editing a note'
do
it
'changes the text'
do
it
'changes the text'
do
find
(
'.js-note-edit'
).
click
find
(
'.js-note-edit'
).
trigger
(
'click'
)
page
.
within
(
'.current-note-edit-form'
)
do
page
.
within
(
'.current-note-edit-form'
)
do
fill_in
'note[note]'
,
with:
'new content'
fill_in
'note[note]'
,
with:
'new content'
...
...
spec/support/features/reportable_note_shared_examples.rb
View file @
3dd1efe6
...
@@ -34,7 +34,7 @@ shared_examples 'reportable note' do
...
@@ -34,7 +34,7 @@ shared_examples 'reportable note' do
end
end
def
open_dropdown
(
dropdown
)
def
open_dropdown
(
dropdown
)
dropdown
.
click
dropdown
.
find
(
'.more-actions-toggle'
).
trigger
(
'click'
)
dropdown
.
find
(
'.dropdown-menu li'
,
match: :first
)
dropdown
.
find
(
'.dropdown-menu li'
,
match: :first
)
end
end
end
end
spec/support/helpers/note_interaction_helpers.rb
View file @
3dd1efe6
...
@@ -2,7 +2,7 @@ module NoteInteractionHelpers
...
@@ -2,7 +2,7 @@ module NoteInteractionHelpers
def
open_more_actions_dropdown
(
note
)
def
open_more_actions_dropdown
(
note
)
note_element
=
find
(
"#note_
#{
note
.
id
}
"
)
note_element
=
find
(
"#note_
#{
note
.
id
}
"
)
note_element
.
find
(
'.more-actions
'
).
click
note_element
.
find
(
'.more-actions
-toggle'
).
trigger
(
'click'
)
note_element
.
find
(
'.more-actions .dropdown-menu li'
,
match: :first
)
note_element
.
find
(
'.more-actions .dropdown-menu li'
,
match: :first
)
end
end
end
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