diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-24 09:09:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-24 09:09:01 +0300 |
commit | fa7ac2663b53f61551b9db51f16d55fa4e5b74c3 (patch) | |
tree | 0cbf33baee16b10803c1d23ec9e0c06e238e43f5 /spec/requests/import | |
parent | 4870899d6cec693b58acbef91636e1310160fa28 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/requests/import')
-rw-r--r-- | spec/requests/import/gitlab_groups_controller_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/import/gitlab_projects_controller_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/requests/import/gitlab_groups_controller_spec.rb b/spec/requests/import/gitlab_groups_controller_spec.rb index 35f2bf0c2f7..1ca1df2998f 100644 --- a/spec/requests/import/gitlab_groups_controller_spec.rb +++ b/spec/requests/import/gitlab_groups_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Import::GitlabGroupsController do +RSpec.describe Import::GitlabGroupsController do include WorkhorseHelpers let(:import_path) { "#{Dir.tmpdir}/gitlab_groups_controller_spec" } diff --git a/spec/requests/import/gitlab_projects_controller_spec.rb b/spec/requests/import/gitlab_projects_controller_spec.rb index f16755e9766..c1ac5a9f2c8 100644 --- a/spec/requests/import/gitlab_projects_controller_spec.rb +++ b/spec/requests/import/gitlab_projects_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Import::GitlabProjectsController do +RSpec.describe Import::GitlabProjectsController do include WorkhorseHelpers let(:workhorse_token) { JWT.encode({ 'iss' => 'gitlab-workhorse' }, Gitlab::Workhorse.secret, 'HS256') } |