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
Boxiang Sun
gitlab-ce
Commits
08172ff5
Commit
08172ff5
authored
7 years ago
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Expand Spinach window size and remove unsupported trigger calls
parent
a5e096ce
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
5 deletions
+1
-5
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+0
-2
features/steps/shared/diff_note.rb
features/steps/shared/diff_note.rb
+0
-2
features/support/capybara.rb
features/support/capybara.rb
+1
-1
No files found.
features/steps/project/merge_requests.rb
View file @
08172ff5
...
@@ -356,8 +356,6 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
...
@@ -356,8 +356,6 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end
end
step
'I should see a discussion by user "John Doe" has started on diff'
do
step
'I should see a discussion by user "John Doe" has started on diff'
do
# Trigger a refresh of notes
execute_script
(
"$(document).trigger('visibilitychange');"
)
wait_for_requests
wait_for_requests
page
.
within
(
".notes .discussion"
)
do
page
.
within
(
".notes .discussion"
)
do
page
.
should
have_content
"
#{
user_exists
(
"John Doe"
).
name
}
#{
user_exists
(
"John Doe"
).
to_reference
}
started a discussion"
page
.
should
have_content
"
#{
user_exists
(
"John Doe"
).
name
}
#{
user_exists
(
"John Doe"
).
to_reference
}
started a discussion"
...
...
This diff is collapsed.
Click to expand it.
features/steps/shared/diff_note.rb
View file @
08172ff5
...
@@ -227,12 +227,10 @@ module SharedDiffNote
...
@@ -227,12 +227,10 @@ module SharedDiffNote
end
end
def
click_diff_line
(
code
)
def
click_diff_line
(
code
)
find
(
".line_holder[id='
#{
code
}
'] td:nth-of-type(1)"
).
trigger
'mouseover'
find
(
".line_holder[id='
#{
code
}
'] button"
).
click
find
(
".line_holder[id='
#{
code
}
'] button"
).
click
end
end
def
click_parallel_diff_line
(
code
,
line_type
)
def
click_parallel_diff_line
(
code
,
line_type
)
find
(
".line_holder.parallel .diff-line-num[id='
#{
code
}
']"
).
trigger
'mouseover'
find
(
".line_holder.parallel button[data-line-code='
#{
code
}
']"
).
click
find
(
".line_holder.parallel button[data-line-code='
#{
code
}
']"
).
click
end
end
end
end
This diff is collapsed.
Click to expand it.
features/support/capybara.rb
View file @
08172ff5
...
@@ -7,7 +7,7 @@ Capybara.javascript_driver = :chrome
...
@@ -7,7 +7,7 @@ Capybara.javascript_driver = :chrome
Capybara
.
register_driver
:chrome
do
|
app
|
Capybara
.
register_driver
:chrome
do
|
app
|
capabilities
=
Selenium
::
WebDriver
::
Remote
::
Capabilities
.
chrome
(
capabilities
=
Selenium
::
WebDriver
::
Remote
::
Capabilities
.
chrome
(
'chromeOptions'
=>
{
'chromeOptions'
=>
{
'args'
=>
%w[headless no-sandbox disable-gpu]
'args'
=>
%w[headless no-sandbox disable-gpu
--window-size=1240,1400
]
}
}
)
)
...
...
This diff is collapsed.
Click to expand it.
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