diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
| commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
| tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /spec/lib/gitlab/template | |
| parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) | |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'spec/lib/gitlab/template')
6 files changed, 6 insertions, 6 deletions
diff --git a/spec/lib/gitlab/template/finders/global_template_finder_spec.rb b/spec/lib/gitlab/template/finders/global_template_finder_spec.rb index 580da497944..e776284b3e8 100644 --- a/spec/lib/gitlab/template/finders/global_template_finder_spec.rb +++ b/spec/lib/gitlab/template/finders/global_template_finder_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Template::Finders::GlobalTemplateFinder do +RSpec.describe Gitlab::Template::Finders::GlobalTemplateFinder do let(:base_dir) { Dir.mktmpdir } def create_template!(name_with_category) diff --git a/spec/lib/gitlab/template/finders/repo_template_finders_spec.rb b/spec/lib/gitlab/template/finders/repo_template_finders_spec.rb index cd5cde76b73..05f351be702 100644 --- a/spec/lib/gitlab/template/finders/repo_template_finders_spec.rb +++ b/spec/lib/gitlab/template/finders/repo_template_finders_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Template::Finders::RepoTemplateFinder do +RSpec.describe Gitlab::Template::Finders::RepoTemplateFinder do let_it_be(:project) { create(:project, :repository) } let(:categories) { { 'HTML' => 'html' } } diff --git a/spec/lib/gitlab/template/gitignore_template_spec.rb b/spec/lib/gitlab/template/gitignore_template_spec.rb index e8f632889ad..365b579d08e 100644 --- a/spec/lib/gitlab/template/gitignore_template_spec.rb +++ b/spec/lib/gitlab/template/gitignore_template_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Template::GitignoreTemplate do +RSpec.describe Gitlab::Template::GitignoreTemplate do subject { described_class } describe '.all' do diff --git a/spec/lib/gitlab/template/gitlab_ci_yml_template_spec.rb b/spec/lib/gitlab/template/gitlab_ci_yml_template_spec.rb index 52e100768a7..3004de6fe08 100644 --- a/spec/lib/gitlab/template/gitlab_ci_yml_template_spec.rb +++ b/spec/lib/gitlab/template/gitlab_ci_yml_template_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Template::GitlabCiYmlTemplate do +RSpec.describe Gitlab::Template::GitlabCiYmlTemplate do subject { described_class } describe '.all' do diff --git a/spec/lib/gitlab/template/issue_template_spec.rb b/spec/lib/gitlab/template/issue_template_spec.rb index 54e46d3a9ec..4acbdcc4ba6 100644 --- a/spec/lib/gitlab/template/issue_template_spec.rb +++ b/spec/lib/gitlab/template/issue_template_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Template::IssueTemplate do +RSpec.describe Gitlab::Template::IssueTemplate do let(:project) { create(:project, :repository, create_templates: :issue) } describe '.all' do diff --git a/spec/lib/gitlab/template/merge_request_template_spec.rb b/spec/lib/gitlab/template/merge_request_template_spec.rb index bbc184d4dfc..abac0a10e18 100644 --- a/spec/lib/gitlab/template/merge_request_template_spec.rb +++ b/spec/lib/gitlab/template/merge_request_template_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Template::MergeRequestTemplate do +RSpec.describe Gitlab::Template::MergeRequestTemplate do let(:project) { create(:project, :repository, create_templates: :merge_request) } describe '.all' do |