diff --git a/features/step_definitions/custom_web_steps.rb b/features/step_definitions/custom_web_steps.rb index 97a8e1035..a84f2d337 100644 --- a/features/step_definitions/custom_web_steps.rb +++ b/features/step_definitions/custom_web_steps.rb @@ -210,36 +210,11 @@ end And /^I scroll down$/ do page.execute_script("window.scrollBy(0,3000000)") end -And /^I scroll down on the notifications dropdown$/ do - page.execute_script("$('.notifications').scrollTop(350)") -end Then /^I should have scrolled down$/ do expect(page.evaluate_script("window.pageYOffset")).to be > 0 end -Then /^I should have scrolled down on the notification dropdown$/ do - expect(page.evaluate_script("$('.notifications').scrollTop()")).to be > 0 -end - - -Then /^the notification dropdown should be visible$/ do - expect(find(:css, "#notification-dropdown")).to be_visible -end - -Then /^the notification dropdown scrollbar should be visible$/ do - find(:css, ".ps-active-y").should be_visible -end - -Then /^there should be (\d+) notifications loaded$/ do |n| - result = page.evaluate_script("$('.media.stream-element').length") - result.should == n.to_i -end - -And "I wait for notifications to load" do - page.should_not have_selector(".loading") -end - When /^I resize my window to 800x600$/ do page.driver.resize(800, 600) end @@ -321,8 +296,3 @@ end Then(/^I should have a validation error on "(.*?)"$/) do |field_list| check_fields_validation_error field_list end - -And /^I activate the first hovercard after loading the notifications page$/ do - page.should have_css '.notifications .hovercardable' - first('.notifications .hovercardable').hover -end diff --git a/features/step_definitions/notifications_steps.rb b/features/step_definitions/notifications_steps.rb index c7852edce..607cd34b8 100644 --- a/features/step_definitions/notifications_steps.rb +++ b/features/step_definitions/notifications_steps.rb @@ -16,3 +16,33 @@ Then /^I should( not)? have activated notifications for the post( in the single expect(find(selector, match: :first)).to have_no_css(".create_participation", visible: false) end end + +And "I wait for notifications to load" do + page.should_not have_selector(".loading") +end + +And /^I scroll down on the notifications dropdown$/ do + page.execute_script("$('.notifications').scrollTop(350)") +end + +Then /^I should have scrolled down on the notification dropdown$/ do + expect(page.evaluate_script("$('.notifications').scrollTop()")).to be > 0 +end + +Then /^the notification dropdown should be visible$/ do + expect(find(:css, "#notification-dropdown")).to be_visible +end + +Then /^the notification dropdown scrollbar should be visible$/ do + find(:css, ".ps-active-y").should be_visible +end + +Then /^there should be (\d+) notifications loaded$/ do |n| + result = page.evaluate_script("$('.media.stream-element').length") + result.should == n.to_i +end + +And /^I activate the first hovercard after loading the notifications page$/ do + page.should have_css '.notifications .hovercardable' + first('.notifications .hovercardable').hover +end