diff options
author | Stan Hu <stanhu@gmail.com> | 2015-07-08 08:28:37 -0700 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2015-07-08 15:57:24 -0400 |
commit | 098ced4faad8d1048d6735f5b3ad6da6aa49fcfe (patch) | |
tree | 2fcccc42576e264f4b5d208c208437eb455bc168 /spec | |
parent | 098ad0a5b418b2414ab7c20b370d19a254109d19 (diff) | |
download | gitlab-ce-098ced4faad8d1048d6735f5b3ad6da6aa49fcfe.tar.gz |
Improve features to ensure Ajax filter has actually executedrs-dev-issue-2372
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/issues/filter_by_milestone_spec.rb | 8 | ||||
-rw-r--r-- | spec/features/merge_requests/filter_by_milestone_spec.rb | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/spec/features/issues/filter_by_milestone_spec.rb b/spec/features/issues/filter_by_milestone_spec.rb index afefe9d9691..f600f8684ac 100644 --- a/spec/features/issues/filter_by_milestone_spec.rb +++ b/spec/features/issues/filter_by_milestone_spec.rb @@ -3,9 +3,12 @@ require 'rails_helper' feature 'Issue filtering by Milestone', feature: true do include Select2Helper + let(:project) { create(:project, :public) } + let(:milestone) { create(:milestone, project: project) } + scenario 'filters by no Milestone', js: true do - project = create(:project, :public) create(:issue, project: project) + create(:issue, project: project, milestone: milestone) visit_issues(project) filter_by_milestone(Milestone::None.title) @@ -14,9 +17,8 @@ feature 'Issue filtering by Milestone', feature: true do end scenario 'filters by a specific Milestone', js: true do - project = create(:project, :public) - milestone = create(:milestone, project: project) create(:issue, project: project, milestone: milestone) + create(:issue, project: project) visit_issues(project) filter_by_milestone(milestone.title) diff --git a/spec/features/merge_requests/filter_by_milestone_spec.rb b/spec/features/merge_requests/filter_by_milestone_spec.rb index 86b95e6cc29..f70214e1122 100644 --- a/spec/features/merge_requests/filter_by_milestone_spec.rb +++ b/spec/features/merge_requests/filter_by_milestone_spec.rb @@ -3,9 +3,12 @@ require 'rails_helper' feature 'Merge Request filtering by Milestone', feature: true do include Select2Helper + let(:project) { create(:project, :public) } + let(:milestone) { create(:milestone, project: project) } + scenario 'filters by no Milestone', js: true do - project = create(:project, :public) create(:merge_request, :with_diffs, source_project: project) + create(:merge_request, :simple, source_project: project, milestone: milestone) visit_merge_requests(project) filter_by_milestone(Milestone::None.title) @@ -14,9 +17,8 @@ feature 'Merge Request filtering by Milestone', feature: true do end scenario 'filters by a specific Milestone', js: true do - project = create(:project, :public) - milestone = create(:milestone, project: project) create(:merge_request, :with_diffs, source_project: project, milestone: milestone) + create(:merge_request, :simple, source_project: project) visit_merge_requests(project) filter_by_milestone(milestone.title) |