diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-08-17 20:38:50 +0000 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-08-18 10:39:31 -0500 |
| commit | 35e32d1566dfa0ff2727c4af727806571cfabb7b (patch) | |
| tree | c5e3eb54e2ee0deab5932f875e76769719081a31 /features | |
| parent | 1ad1ed9d582c964006cebea0bbf9a63b60db9985 (diff) | |
| download | gitlab-ce-35e32d1566dfa0ff2727c4af727806571cfabb7b.tar.gz | |
Merge branch 'remove-sleep-calls-from-phantom-update-spinach-specs' into 'master'
Remove sleep calls introduced in !5740
See merge request !5815
Diffstat (limited to 'features')
| -rw-r--r-- | features/steps/project/issues/issues.rb | 4 | ||||
| -rw-r--r-- | features/steps/project/merge_requests.rb | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb index daee90b3767..056462a7152 100644 --- a/features/steps/project/issues/issues.rb +++ b/features/steps/project/issues/issues.rb @@ -45,6 +45,8 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps step 'I click link "All"' do click_link "All" + # Waits for load + expect(find('.issues-state-filters > .active')).to have_content 'All' end step 'I click link "Release 0.4"' do @@ -354,8 +356,6 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps end def filter_issue(text) - sleep 1 fill_in 'issue_search', with: text - sleep 1 end end diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index 53d1aedf27f..9778ff4a6c7 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -22,6 +22,8 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps step 'I click link "All"' do click_link "All" + # Waits for load + expect(find('.issues-state-filters > .active')).to have_content 'All' end step 'I click link "Merged"' do @@ -489,7 +491,6 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps end step 'I fill in merge request search with "Fe"' do - sleep 1 fill_in 'issue_search', with: "Fe" end |