diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-04-24 19:06:47 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-04-24 19:06:47 +0300 |
| commit | 3855751d024d20a05343141c65aa3b588645dcfa (patch) | |
| tree | 1d8ad1eea271f2956532c651af3b2e5cfc9e5c46 /spec/features/projects/members | |
| parent | 9d17ad1048779c3e8ff5f8af4d6497a1140cfe33 (diff) | |
| parent | ff76adb5476f663fe92cec0ec4a78e93c7615191 (diff) | |
Merge branch 'jacopo-beschi/gitlab-ce-29712-unnecessary-wait-for-ajax'
See merge request !10567
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'spec/features/projects/members')
| -rw-r--r-- | spec/features/projects/members/group_links_spec.rb | 2 | ||||
| -rw-r--r-- | spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/spec/features/projects/members/group_links_spec.rb b/spec/features/projects/members/group_links_spec.rb index cffb935ad5a..ab2b089db2e 100644 --- a/spec/features/projects/members/group_links_spec.rb +++ b/spec/features/projects/members/group_links_spec.rb @@ -1,8 +1,6 @@ require 'spec_helper' feature 'Projects > Members > Anonymous user sees members', feature: true, js: true do - include WaitForAjax - let(:user) { create(:user) } let(:group) { create(:group, :public) } let(:project) { create(:empty_project, :public) } diff --git a/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb b/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb index c3f45be6e4b..19d14ad9af4 100644 --- a/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb +++ b/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb @@ -1,7 +1,6 @@ require 'spec_helper' feature 'Projects > Members > Master adds member with expiration date', feature: true, js: true do - include WaitForAjax include Select2Helper include ActiveSupport::Testing::TimeHelpers |