summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-08-11 23:02:21 -0700
committerStan Hu <stanhu@gmail.com>2017-08-11 23:02:21 -0700
commit08172ff595f3c28080e2e5a45d15e28007d5206e (patch)
treea1c89cdeb6008b8bbbb1d78cc49c66ff6253323e
parenta5e096ceaa468ba3f3ff3b70369e2b16d76e55e9 (diff)
downloadgitlab-ce-08172ff595f3c28080e2e5a45d15e28007d5206e.tar.gz
Expand Spinach window size and remove unsupported trigger calls
-rw-r--r--features/steps/project/merge_requests.rb2
-rw-r--r--features/steps/shared/diff_note.rb2
-rw-r--r--features/support/capybara.rb2
3 files changed, 1 insertions, 5 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index d6c1c73ae83..5cd66723612 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -356,8 +356,6 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end
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
page.within(".notes .discussion") do
page.should have_content "#{user_exists("John Doe").name} #{user_exists("John Doe").to_reference} started a discussion"
diff --git a/features/steps/shared/diff_note.rb b/features/steps/shared/diff_note.rb
index 312187cbd0f..4f2f33cf768 100644
--- a/features/steps/shared/diff_note.rb
+++ b/features/steps/shared/diff_note.rb
@@ -227,12 +227,10 @@ module SharedDiffNote
end
def click_diff_line(code)
- find(".line_holder[id='#{code}'] td:nth-of-type(1)").trigger 'mouseover'
find(".line_holder[id='#{code}'] button").click
end
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
end
end
diff --git a/features/support/capybara.rb b/features/support/capybara.rb
index 595577804bd..20abb504dc6 100644
--- a/features/support/capybara.rb
+++ b/features/support/capybara.rb
@@ -7,7 +7,7 @@ Capybara.javascript_driver = :chrome
Capybara.register_driver :chrome do |app|
capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
'chromeOptions' => {
- 'args' => %w[headless no-sandbox disable-gpu]
+ 'args' => %w[headless no-sandbox disable-gpu --window-size=1240,1400]
}
)