Commit 1ba9f029 authored by Rémy Coutable's avatar Rémy Coutable

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
parents 6d7deac3 75edb869
require 'spec_helper' require 'spec_helper'
describe API::Applications, :api do describe API::Applications, :api do
include ApiHelpers
let(:admin_user) { create(:user, admin: true) } let(:admin_user) { create(:user, admin: true) }
let(:user) { create(:user, admin: false) } let(:user) { create(:user, admin: false) }
let!(:application) { create(:application, name: 'another_application', redirect_uri: 'http://other_application.url', scopes: '') } let!(:application) { create(:application, name: 'another_application', redirect_uri: 'http://other_application.url', scopes: '') }
......
require 'spec_helper' require 'spec_helper'
describe API::Events do describe API::Events do
include ApiHelpers
let(:user) { create(:user) } let(:user) { create(:user) }
let(:non_member) { create(:user) } let(:non_member) { create(:user) }
let(:private_project) { create(:project, :private, creator_id: user.id, namespace: user.namespace) } let(:private_project) { create(:project, :private, creator_id: user.id, namespace: user.namespace) }
......
require 'spec_helper' require 'spec_helper'
describe API::ImportGithub do describe API::ImportGithub do
include ApiHelpers
let(:token) { "asdasd12345" } let(:token) { "asdasd12345" }
let(:provider) { :github } let(:provider) { :github }
let(:access_params) { { github_access_token: token } } let(:access_params) { { github_access_token: token } }
......
require 'spec_helper' require 'spec_helper'
describe API::ProjectEvents do describe API::ProjectEvents do
include ApiHelpers
let(:user) { create(:user) } let(:user) { create(:user) }
let(:non_member) { create(:user) } let(:non_member) { create(:user) }
let(:private_project) { create(:project, :private, creator_id: user.id, namespace: user.namespace) } let(:private_project) { create(:project, :private, creator_id: user.id, namespace: user.namespace) }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment