diff options
-rw-r--r-- | spec/features/boards/boards_spec.rb | 1 | ||||
-rw-r--r-- | spec/features/issues/filtered_search/visual_tokens_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/issues/gfm_autocomplete_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/merge_requests/diff_notes_avatars_spec.rb | 1 | ||||
-rw-r--r-- | spec/features/merge_requests/user_posts_diff_notes_spec.rb | 1 | ||||
-rw-r--r-- | spec/features/projects/ref_switcher_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/projects/tree/create_directory_spec.rb | 3 | ||||
-rw-r--r-- | spec/features/projects/tree/create_file_spec.rb | 3 | ||||
-rw-r--r-- | spec/features/projects/tree/upload_file_spec.rb | 3 | ||||
-rw-r--r-- | spec/spec_helper.rb | 2 |
10 files changed, 2 insertions, 18 deletions
diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb index 49eecb34aaa..f91c9b66986 100644 --- a/spec/features/boards/boards_spec.rb +++ b/spec/features/boards/boards_spec.rb @@ -1,7 +1,6 @@ require 'rails_helper' describe 'Issue Boards', :js do - include CookieHelper include DragTo let(:group) { create(:group, :nested) } diff --git a/spec/features/issues/filtered_search/visual_tokens_spec.rb b/spec/features/issues/filtered_search/visual_tokens_spec.rb index 9d7d8f8ebff..0ae70c855db 100644 --- a/spec/features/issues/filtered_search/visual_tokens_spec.rb +++ b/spec/features/issues/filtered_search/visual_tokens_spec.rb @@ -1,9 +1,7 @@ require 'rails_helper' describe 'Visual tokens', :js do - include CookieHelper include FilteredSearchHelpers - include WaitForRequests let!(:project) { create(:project) } let!(:user) { create(:user, name: 'administrator', username: 'root') } diff --git a/spec/features/issues/gfm_autocomplete_spec.rb b/spec/features/issues/gfm_autocomplete_spec.rb index ac75b1fcdba..a04042a8c85 100644 --- a/spec/features/issues/gfm_autocomplete_spec.rb +++ b/spec/features/issues/gfm_autocomplete_spec.rb @@ -1,8 +1,6 @@ require 'rails_helper' feature 'GFM autocomplete', :js do - include InputHelper - let(:user) { create(:user, name: '💃speciąl someone💃', username: 'someone.special') } let(:project) { create(:project) } let(:label) { create(:label, project: project, title: 'special+') } diff --git a/spec/features/merge_requests/diff_notes_avatars_spec.rb b/spec/features/merge_requests/diff_notes_avatars_spec.rb index e28eb463199..9e816cf041b 100644 --- a/spec/features/merge_requests/diff_notes_avatars_spec.rb +++ b/spec/features/merge_requests/diff_notes_avatars_spec.rb @@ -1,7 +1,6 @@ require 'spec_helper' feature 'Diff note avatars', :js do - include CookieHelper include NoteInteractionHelpers let(:user) { create(:user) } diff --git a/spec/features/merge_requests/user_posts_diff_notes_spec.rb b/spec/features/merge_requests/user_posts_diff_notes_spec.rb index cf62f042b90..d44eb23d7f4 100644 --- a/spec/features/merge_requests/user_posts_diff_notes_spec.rb +++ b/spec/features/merge_requests/user_posts_diff_notes_spec.rb @@ -1,7 +1,6 @@ require 'spec_helper' feature 'Merge requests > User posts diff notes', :js do - include CookieHelper include MergeRequestDiffHelpers let(:user) { create(:user) } diff --git a/spec/features/projects/ref_switcher_spec.rb b/spec/features/projects/ref_switcher_spec.rb index 44b70b7b52a..33ccbc1a29f 100644 --- a/spec/features/projects/ref_switcher_spec.rb +++ b/spec/features/projects/ref_switcher_spec.rb @@ -1,8 +1,6 @@ require 'rails_helper' feature 'Ref switcher', :js do - include CookieHelper - let(:user) { create(:user) } let(:project) { create(:project, :public, :repository) } diff --git a/spec/features/projects/tree/create_directory_spec.rb b/spec/features/projects/tree/create_directory_spec.rb index 174d4cb4e08..8ee7b9cf015 100644 --- a/spec/features/projects/tree/create_directory_spec.rb +++ b/spec/features/projects/tree/create_directory_spec.rb @@ -1,9 +1,6 @@ require 'spec_helper' feature 'Multi-file editor new directory', :js do - include CookieHelper - include WaitForRequests - let(:user) { create(:user) } let(:project) { create(:project, :repository) } diff --git a/spec/features/projects/tree/create_file_spec.rb b/spec/features/projects/tree/create_file_spec.rb index 7eea81d1e8d..1e2de0711b8 100644 --- a/spec/features/projects/tree/create_file_spec.rb +++ b/spec/features/projects/tree/create_file_spec.rb @@ -1,9 +1,6 @@ require 'spec_helper' feature 'Multi-file editor new file', :js do - include CookieHelper - include WaitForRequests - let(:user) { create(:user) } let(:project) { create(:project, :repository) } diff --git a/spec/features/projects/tree/upload_file_spec.rb b/spec/features/projects/tree/upload_file_spec.rb index b7e940eac43..8439bb5a69e 100644 --- a/spec/features/projects/tree/upload_file_spec.rb +++ b/spec/features/projects/tree/upload_file_spec.rb @@ -1,9 +1,6 @@ require 'spec_helper' feature 'Multi-file editor upload file', :js do - include CookieHelper - include WaitForRequests - let(:user) { create(:user) } let(:project) { create(:project, :repository) } let(:txt_file) { File.join(Rails.root, 'spec', 'fixtures', 'doc_sample.txt') } diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 48cacba6a8a..8b8c699bf85 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -48,6 +48,8 @@ RSpec.configure do |config| config.include Warden::Test::Helpers, type: :request config.include LoginHelpers, type: :feature config.include SearchHelpers, type: :feature + config.include CookieHelper, :js + config.include InputHelper, :js config.include WaitForRequests, :js config.include StubConfiguration config.include EmailHelpers, :mailer, type: :mailer |