diff options
author | Connor Shea <connor.james.shea@gmail.com> | 2016-08-12 11:44:43 -0600 |
---|---|---|
committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-08-13 00:57:40 -0500 |
commit | 1392cad8956c490b5ba6106678ab16d790662148 (patch) | |
tree | 48d43418dee36b8c244794b9a6bb94f5599c7488 | |
parent | 5d8ad797503c76ab9818584cf3b2e945ff8cfd68 (diff) | |
download | gitlab-ce-1392cad8956c490b5ba6106678ab16d790662148.tar.gz |
Remove sleeping and replace escaped text.
-rw-r--r-- | features/steps/dashboard/event_filters.rb | 12 | ||||
-rw-r--r-- | spec/features/profiles/preferences_spec.rb | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/features/steps/dashboard/event_filters.rb b/features/steps/dashboard/event_filters.rb index 3ff260c0027..ca3cd0ecc4e 100644 --- a/features/steps/dashboard/event_filters.rb +++ b/features/steps/dashboard/event_filters.rb @@ -73,20 +73,20 @@ class Spinach::Features::EventFilters < Spinach::FeatureSteps end When 'I click "push" event filter' do - sleep 1 + wait_for_ajax click_link("Push events") - sleep 2 + wait_for_ajax end When 'I click "team" event filter' do - sleep 1 + wait_for_ajax click_link("Team") - sleep 2 + wait_for_ajax end When 'I click "merge" event filter' do - sleep 1 + wait_for_ajax click_link("Merge events") - sleep 2 + wait_for_ajax end end diff --git a/spec/features/profiles/preferences_spec.rb b/spec/features/profiles/preferences_spec.rb index 259ed7531d8..d14a1158b67 100644 --- a/spec/features/profiles/preferences_spec.rb +++ b/spec/features/profiles/preferences_spec.rb @@ -69,13 +69,13 @@ describe 'Profile > Preferences', feature: true do allowing_for_delay do find('#logo').click - expect(page).to have_content('You don\'t have starred projects yet') + expect(page).to have_content("You don't have starred projects yet") expect(page.current_path).to eq starred_dashboard_projects_path end click_link 'Your Projects' - expect(page).not_to have_content('You don\'t have starred projects yet') + expect(page).not_to have_content("You don't have starred projects yet") expect(page.current_path).to eq dashboard_projects_path end end |