diff options
author | Rémy Coutable <remy@rymai.me> | 2017-04-04 19:04:25 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-04-04 19:04:25 +0000 |
commit | 050bafaa7c8487b0a63416b04143d83c43ec4101 (patch) | |
tree | 79e2a28c0ba69ccc4b37f7e07a14b46d911ee1c7 | |
parent | 30253183c66229b8d2f8e3e26f28470fb4bbc84a (diff) | |
parent | 3d61609cb42b2ab826498ac0e355841baa5cd482 (diff) | |
download | gitlab-ce-050bafaa7c8487b0a63416b04143d83c43ec4101.tar.gz |
Merge branch 'rs-sign-in-poc' into 'master'
Use `sign_in` instead of `login_as` when we're not testing login flow
See merge request !10296
-rw-r--r-- | spec/features/issues/filtered_search/filter_issues_spec.rb | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/spec/features/issues/filtered_search/filter_issues_spec.rb b/spec/features/issues/filtered_search/filter_issues_spec.rb index 004e335dd38..2f880c926e7 100644 --- a/spec/features/issues/filtered_search/filter_issues_spec.rb +++ b/spec/features/issues/filtered_search/filter_issues_spec.rb @@ -1,6 +1,7 @@ require 'spec_helper' describe 'Filter issues', js: true, feature: true do + include Devise::Test::IntegrationHelpers include FilteredSearchHelpers include WaitForAjax @@ -42,16 +43,17 @@ describe 'Filter issues', js: true, feature: true do project.team << [user2, :master] group.add_developer(user) group.add_developer(user2) - login_as(user) - create(:issue, project: project) - create(:issue, title: "Bug report 1", project: project) - create(:issue, title: "Bug report 2", project: project) - create(:issue, title: "issue with 'single quotes'", project: project) - create(:issue, title: "issue with \"double quotes\"", project: project) - create(:issue, title: "issue with !@\#{$%^&*()-+", project: project) - create(:issue, title: "issue by assignee", project: project, milestone: milestone, author: user, assignee: user) - create(:issue, title: "issue by assignee with searchTerm", project: project, milestone: milestone, author: user, assignee: user) + sign_in(user) + + create(:issue, project: project) + create(:issue, project: project, title: "Bug report 1") + create(:issue, project: project, title: "Bug report 2") + create(:issue, project: project, title: "issue with 'single quotes'") + create(:issue, project: project, title: "issue with \"double quotes\"") + create(:issue, project: project, title: "issue with !@\#{$%^&*()-+") + create(:issue, project: project, title: "issue by assignee", milestone: milestone, author: user, assignee: user) + create(:issue, project: project, title: "issue by assignee with searchTerm", milestone: milestone, author: user, assignee: user) issue = create(:issue, title: "Bug 2", |