summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-03-29 18:20:10 +0100
committerPhil Hughes <me@iamphill.com>2016-03-29 18:20:10 +0100
commit6a3d8ac207c300474ccfbbd3c5cab8566279b9ac (patch)
tree7a83e7e897485032d809de1b14f515139f3ae24e
parent31fea92295302d93973f0836eb4d040550b2deda (diff)
downloadgitlab-ce-added-milestone-upcoming.tar.gz
-rw-r--r--spec/features/issues/filter_by_milestone_spec.rb8
-rw-r--r--spec/features/merge_requests/filter_by_milestone_spec.rb6
2 files changed, 6 insertions, 8 deletions
diff --git a/spec/features/issues/filter_by_milestone_spec.rb b/spec/features/issues/filter_by_milestone_spec.rb
index b5d3c956662..99445185893 100644
--- a/spec/features/issues/filter_by_milestone_spec.rb
+++ b/spec/features/issues/filter_by_milestone_spec.rb
@@ -33,7 +33,7 @@ feature 'Issue filtering by Milestone', feature: true do
visit_issues(project)
filter_by_milestone(Milestone::Upcoming.title)
- expect(page).to have_css('.issue .title', count: 1)
+ expect(page).to have_css('.issue', count: 1)
end
it 'should not show issues in past' do
@@ -44,7 +44,7 @@ feature 'Issue filtering by Milestone', feature: true do
visit_issues(project)
filter_by_milestone(Milestone::Upcoming.title)
- expect(page).to have_css('.issue .title', count: 0)
+ expect(page).to have_css('.issue', count: 0)
end
end
@@ -55,7 +55,7 @@ feature 'Issue filtering by Milestone', feature: true do
visit_issues(project)
filter_by_milestone(milestone.title)
- expect(page).to have_css('.issue .title', count: 1)
+ expect(page).to have_css('.issue', count: 1)
end
def visit_issues(project)
@@ -64,8 +64,6 @@ feature 'Issue filtering by Milestone', feature: true do
def filter_by_milestone(title)
find(".js-milestone-select").click
- sleep 0.5
find(".milestone-filter .dropdown-content a", text: title).click
- sleep 1
end
end
diff --git a/spec/features/merge_requests/filter_by_milestone_spec.rb b/spec/features/merge_requests/filter_by_milestone_spec.rb
index 0fb0ab149e7..c57ab5f3b03 100644
--- a/spec/features/merge_requests/filter_by_milestone_spec.rb
+++ b/spec/features/merge_requests/filter_by_milestone_spec.rb
@@ -33,7 +33,7 @@ feature 'Merge Request filtering by Milestone', feature: true do
visit_merge_requests(project)
filter_by_milestone(Milestone::Upcoming.title)
- expect(page).to have_css('.merge-request-title', count: 1)
+ expect(page).to have_css('.merge-request', count: 1)
end
it 'should not show issues in past' do
@@ -44,7 +44,7 @@ feature 'Merge Request filtering by Milestone', feature: true do
visit_merge_requests(project)
filter_by_milestone(Milestone::Upcoming.title)
- expect(page).to have_css('.merge-request-title', count: 0)
+ expect(page).to have_css('.merge-request', count: 0)
end
end
@@ -55,7 +55,7 @@ feature 'Merge Request filtering by Milestone', feature: true do
visit_merge_requests(project)
filter_by_milestone(milestone.title)
- expect(page).to have_css('.merge-request-title', count: 1)
+ expect(page).to have_css('.merge-request', count: 1)
end
def visit_merge_requests(project)