diff options
| author | Phil Hughes <me@iamphill.com> | 2017-04-26 08:37:50 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-04-26 12:23:29 +0100 |
| commit | 45e5d12122ac04d7558c84e47003fc8c85a9dddd (patch) | |
| tree | db75c6542ec645b905d75581b0f36d8b89b536cc /features/steps | |
| parent | 3c077fad8367264bed3b33fafa537d5c75c4c249 (diff) | |
| download | gitlab-ce-45e5d12122ac04d7558c84e47003fc8c85a9dddd.tar.gz | |
Fixed spinach tests
Removed a spinach test as it wasn't actually testing what it said it should be
Diffstat (limited to 'features/steps')
| -rw-r--r-- | features/steps/group/milestones.rb | 3 | ||||
| -rw-r--r-- | features/steps/project/project_milestone.rb | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/features/steps/group/milestones.rb b/features/steps/group/milestones.rb index f8f5e3f2382..49fcd6f1201 100644 --- a/features/steps/group/milestones.rb +++ b/features/steps/group/milestones.rb @@ -1,4 +1,5 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps + include WaitForAjax include SharedAuthentication include SharedPaths include SharedGroup @@ -90,6 +91,8 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps end step 'I should see the list of labels' do + wait_for_ajax + page.within('#tab-labels') do expect(page).to have_content 'bug' expect(page).to have_content 'feature' diff --git a/features/steps/project/project_milestone.rb b/features/steps/project/project_milestone.rb index 1864b3a2b52..dc1190b7eea 100644 --- a/features/steps/project/project_milestone.rb +++ b/features/steps/project/project_milestone.rb @@ -2,6 +2,7 @@ class Spinach::Features::ProjectMilestone < Spinach::FeatureSteps include SharedAuthentication include SharedProject include SharedPaths + include WaitForAjax step 'milestone has issue "Bugfix1" with labels: "bug", "feature"' do project = Project.find_by(name: "Shop") @@ -34,6 +35,8 @@ class Spinach::Features::ProjectMilestone < Spinach::FeatureSteps end step 'I should see the labels "bug", "enhancement" and "feature"' do + wait_for_ajax + page.within('#tab-issues') do expect(page).to have_content 'bug' expect(page).to have_content 'enhancement' |