diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 13:18:24 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 13:18:24 +0000 |
| commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
| tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /spec/tooling | |
| parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) | |
| download | gitlab-ce-0653e08efd039a5905f3fa4f6e9cef9f5d2f799c.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'spec/tooling')
| -rw-r--r-- | spec/tooling/danger/project_helper_spec.rb | 4 | ||||
| -rw-r--r-- | spec/tooling/graphql/docs/renderer_spec.rb | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/spec/tooling/danger/project_helper_spec.rb b/spec/tooling/danger/project_helper_spec.rb index f52c5e02544..c7715eb43fc 100644 --- a/spec/tooling/danger/project_helper_spec.rb +++ b/spec/tooling/danger/project_helper_spec.rb @@ -60,7 +60,6 @@ RSpec.describe Tooling::Danger::ProjectHelper do 'app/views/foo' | [:frontend] 'public/foo' | [:frontend] 'scripts/frontend/foo' | [:frontend] - 'spec/javascripts/foo' | [:frontend] 'spec/frontend/bar' | [:frontend] 'spec/frontend_integration/bar' | [:frontend] 'vendor/assets/foo' | [:frontend] @@ -73,7 +72,6 @@ RSpec.describe Tooling::Danger::ProjectHelper do 'ee/app/assets/foo' | [:frontend] 'ee/app/views/foo' | [:frontend] - 'ee/spec/javascripts/foo' | [:frontend] 'ee/spec/frontend/bar' | [:frontend] 'ee/spec/frontend_integration/bar' | [:frontend] @@ -220,7 +218,7 @@ RSpec.describe Tooling::Danger::ProjectHelper do describe '.local_warning_message' do it 'returns an informational message with rules that can run' do - expect(described_class.local_warning_message).to eq('==> Only the following Danger rules can be run locally: changelog, database, documentation, duplicate_yarn_dependencies, eslint, gitaly, karma, pajamas, pipeline, prettier, product_intelligence, utility_css, vue_shared_documentation') + expect(described_class.local_warning_message).to eq('==> Only the following Danger rules can be run locally: changelog, database, documentation, duplicate_yarn_dependencies, eslint, gitaly, pajamas, pipeline, prettier, product_intelligence, utility_css, vue_shared_documentation') end end diff --git a/spec/tooling/graphql/docs/renderer_spec.rb b/spec/tooling/graphql/docs/renderer_spec.rb index de5ec928921..1c9605304ff 100644 --- a/spec/tooling/graphql/docs/renderer_spec.rb +++ b/spec/tooling/graphql/docs/renderer_spec.rb @@ -535,8 +535,8 @@ RSpec.describe Tooling::Graphql::Docs::Renderer do | Name | Type | Description | | ---- | ---- | ----------- | - | <a id="timeframeend"></a>`end` | [`Date!`](#date) | The end of the range. | - | <a id="timeframestart"></a>`start` | [`Date!`](#date) | The start of the range. | + | <a id="timeframeend"></a>`end` | [`Date!`](#date) | End of the range. | + | <a id="timeframestart"></a>`start` | [`Date!`](#date) | Start of the range. | DOC end |