diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-02 00:06:26 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-02 00:06:26 +0000 |
commit | 587794b4b8a6e919e77ee4abe8215fa291e6a91d (patch) | |
tree | 380d6578d1ab5902bb521071128bafd4f70472ef /spec/controllers/import | |
parent | e0bd3a45d9dc6c74cac1a33ea8c03d6d8334249b (diff) | |
download | gitlab-ce-587794b4b8a6e919e77ee4abe8215fa291e6a91d.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/import')
-rw-r--r-- | spec/controllers/import/bitbucket_server_controller_spec.rb | 2 | ||||
-rw-r--r-- | spec/controllers/import/gitlab_projects_controller_spec.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/controllers/import/bitbucket_server_controller_spec.rb b/spec/controllers/import/bitbucket_server_controller_spec.rb index e1aeab46fca..f30eace7d30 100644 --- a/spec/controllers/import/bitbucket_server_controller_spec.rb +++ b/spec/controllers/import/bitbucket_server_controller_spec.rb @@ -39,7 +39,7 @@ describe Import::BitbucketServerController do assign_session_tokens end - set(:project) { create(:project) } + let_it_be(:project) { create(:project) } it 'returns the new project' do allow(Gitlab::BitbucketServerImport::ProjectCreator) diff --git a/spec/controllers/import/gitlab_projects_controller_spec.rb b/spec/controllers/import/gitlab_projects_controller_spec.rb index 51b398895bc..a3f6d8dcea2 100644 --- a/spec/controllers/import/gitlab_projects_controller_spec.rb +++ b/spec/controllers/import/gitlab_projects_controller_spec.rb @@ -3,8 +3,8 @@ require 'spec_helper' describe Import::GitlabProjectsController do - set(:namespace) { create(:namespace) } - set(:user) { namespace.owner } + let_it_be(:namespace) { create(:namespace) } + let_it_be(:user) { namespace.owner } let(:file) { fixture_file_upload('spec/fixtures/project_export.tar.gz', 'text/plain') } before do |