diff options
author | Rémy Coutable <remy@rymai.me> | 2019-09-11 12:37:21 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2019-09-11 12:37:21 +0300 |
commit | 1ba9f029e89e99a245a201c21a98f4f79dc7b302 (patch) | |
tree | 1b93eca43728389268ba93910e732a4b3130fb40 | |
parent | 6d7deac3f6daba94b385e83759f3f3e9ccf6f4c9 (diff) | |
parent | 75edb8694100afd29df1183c6afa0a2083cd944a (diff) |
Merge branch 'remove-cluttered-api-helpers-module' into 'master'
Do not include ApiHelpers again in spec/requests/api
See merge request gitlab-org/gitlab-ce!32870
-rw-r--r-- | spec/requests/api/applications_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/events_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/import_github_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/project_events_spec.rb | 2 |
4 files changed, 0 insertions, 8 deletions
diff --git a/spec/requests/api/applications_spec.rb b/spec/requests/api/applications_spec.rb index e47166544d9..53fc3096751 100644 --- a/spec/requests/api/applications_spec.rb +++ b/spec/requests/api/applications_spec.rb @@ -1,8 +1,6 @@ require 'spec_helper' describe API::Applications, :api do - include ApiHelpers - let(:admin_user) { create(:user, admin: true) } let(:user) { create(:user, admin: false) } let!(:application) { create(:application, name: 'another_application', redirect_uri: 'http://other_application.url', scopes: '') } diff --git a/spec/requests/api/events_spec.rb b/spec/requests/api/events_spec.rb index 018691e8099..2fc772b12af 100644 --- a/spec/requests/api/events_spec.rb +++ b/spec/requests/api/events_spec.rb @@ -1,8 +1,6 @@ require 'spec_helper' describe API::Events do - include ApiHelpers - let(:user) { create(:user) } let(:non_member) { create(:user) } let(:private_project) { create(:project, :private, creator_id: user.id, namespace: user.namespace) } diff --git a/spec/requests/api/import_github_spec.rb b/spec/requests/api/import_github_spec.rb index aceff9b4aa6..68df02d4d8d 100644 --- a/spec/requests/api/import_github_spec.rb +++ b/spec/requests/api/import_github_spec.rb @@ -1,8 +1,6 @@ require 'spec_helper' describe API::ImportGithub do - include ApiHelpers - let(:token) { "asdasd12345" } let(:provider) { :github } let(:access_params) { { github_access_token: token } } diff --git a/spec/requests/api/project_events_spec.rb b/spec/requests/api/project_events_spec.rb index 43df9993eb9..8c2db6e4c62 100644 --- a/spec/requests/api/project_events_spec.rb +++ b/spec/requests/api/project_events_spec.rb @@ -1,8 +1,6 @@ require 'spec_helper' describe API::ProjectEvents do - include ApiHelpers - let(:user) { create(:user) } let(:non_member) { create(:user) } let(:private_project) { create(:project, :private, creator_id: user.id, namespace: user.namespace) } |