diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-10 18:07:52 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-10 18:07:52 +0300 |
commit | 27d91a629918e417a9e87825e838209b9ace79c1 (patch) | |
tree | e066c3fc84e3011641e662252810cb2c240edb90 /spec/lib/gitlab | |
parent | 5e11c9b77cb1b2b77ee29359047b55807afe255d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab')
-rw-r--r-- | spec/lib/gitlab/ci/config/entry/default_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/ci/config/entry/job_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/ci/yaml_processor_spec.rb | 4 | ||||
-rw-r--r-- | spec/lib/gitlab/import_export/all_models.yml | 4 |
4 files changed, 8 insertions, 4 deletions
diff --git a/spec/lib/gitlab/ci/config/entry/default_spec.rb b/spec/lib/gitlab/ci/config/entry/default_spec.rb index ffd24aa56b9..391d594bc02 100644 --- a/spec/lib/gitlab/ci/config/entry/default_spec.rb +++ b/spec/lib/gitlab/ci/config/entry/default_spec.rb @@ -27,7 +27,7 @@ describe Gitlab::Ci::Config::Entry::Default do expect(described_class.nodes.keys) .to match_array(%i[before_script image services after_script cache interruptible - timeout retry]) + timeout retry tags]) end end end diff --git a/spec/lib/gitlab/ci/config/entry/job_spec.rb b/spec/lib/gitlab/ci/config/entry/job_spec.rb index 4d6245c2d86..6e077aa00d7 100644 --- a/spec/lib/gitlab/ci/config/entry/job_spec.rb +++ b/spec/lib/gitlab/ci/config/entry/job_spec.rb @@ -24,7 +24,7 @@ describe Gitlab::Ci::Config::Entry::Job do let(:result) do %i[before_script script stage type after_script cache image services only except rules needs variables artifacts - environment coverage retry interruptible timeout] + environment coverage retry interruptible timeout tags] end it { is_expected.to match_array result } diff --git a/spec/lib/gitlab/ci/yaml_processor_spec.rb b/spec/lib/gitlab/ci/yaml_processor_spec.rb index ed2d97b1a38..ff8849f84d5 100644 --- a/spec/lib/gitlab/ci/yaml_processor_spec.rb +++ b/spec/lib/gitlab/ci/yaml_processor_spec.rb @@ -1849,7 +1849,7 @@ module Gitlab config = YAML.dump({ rspec: { script: "test", tags: "mysql" } }) expect do Gitlab::Ci::YamlProcessor.new(config) - end.to raise_error(Gitlab::Ci::YamlProcessor::ValidationError, "jobs:rspec tags should be an array of strings") + end.to raise_error(Gitlab::Ci::YamlProcessor::ValidationError, "jobs:rspec:tags config should be an array of strings") end it "returns errors if before_script parameter is invalid" do @@ -2197,7 +2197,7 @@ module Gitlab context "when the tags parameter is invalid" do let(:content) { YAML.dump({ rspec: { script: "test", tags: "mysql" } }) } - it { is_expected.to eq "jobs:rspec tags should be an array of strings" } + it { is_expected.to eq "jobs:rspec:tags config should be an array of strings" } end context "when YAML content is empty" do diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml index ab17d9993f6..26793f28bd8 100644 --- a/spec/lib/gitlab/import_export/all_models.yml +++ b/spec/lib/gitlab/import_export/all_models.yml @@ -34,6 +34,7 @@ issues: - zoom_meetings - vulnerability_links - related_vulnerabilities +- user_mentions events: - author - project @@ -82,6 +83,7 @@ snippets: - notes - award_emoji - user_agent_detail +- user_mentions releases: - author - project @@ -142,6 +144,7 @@ merge_requests: - description_versions - deployment_merge_requests - deployments +- user_mentions external_pull_requests: - project merge_request_diff: @@ -539,6 +542,7 @@ design: &design - actions - versions - notes +- user_mentions designs: *design actions: - design |