diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-10 18:12:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-10 18:12:01 +0300 |
commit | a45283fcd27598eebd66a97041fa7d79d5a33aa5 (patch) | |
tree | a4152ef9cc78afd4596feb5d3905b0488bced2ac /spec/views | |
parent | 43d1fef975a24dcaac3ad9bbf20ae9839f5ec9ed (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/views')
-rw-r--r-- | spec/views/layouts/_head.html.haml_spec.rb | 10 | ||||
-rw-r--r-- | spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb | 2 | ||||
-rw-r--r-- | spec/views/projects/commit/branches.html.haml_spec.rb | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/spec/views/layouts/_head.html.haml_spec.rb b/spec/views/layouts/_head.html.haml_spec.rb index 504a9492d7a..56936dbafcf 100644 --- a/spec/views/layouts/_head.html.haml_spec.rb +++ b/spec/views/layouts/_head.html.haml_spec.rb @@ -15,7 +15,7 @@ RSpec.describe 'layouts/_head' do render - expect(rendered).to match(%{content="foo" http-equiv="refresh"}) + expect(rendered).to match(%(content="foo" http-equiv="refresh")) end it 'escapes HTML-safe strings in page_description' do @@ -23,7 +23,7 @@ RSpec.describe 'layouts/_head' do render - expect(rendered).to match(%{content="foo" http-equiv="refresh"}) + expect(rendered).to match(%(content="foo" http-equiv="refresh")) end it 'escapes HTML-safe strings in page_image' do @@ -31,7 +31,7 @@ RSpec.describe 'layouts/_head' do render - expect(rendered).to match(%{content="foo" http-equiv="refresh"}) + expect(rendered).to match(%(content="foo" http-equiv="refresh")) end context 'when an asset_host is set' do @@ -101,7 +101,7 @@ RSpec.describe 'layouts/_head' do render expect(rendered).to match(%r{<script.*>.*var u="//#{matomo_host}/".*</script>}m) - expect(rendered).to match(%r(<noscript>.*<img src="//#{matomo_host}/matomo.php.*</noscript>)) + expect(rendered).to match(%r{<noscript>.*<img src="//#{matomo_host}/matomo.php.*</noscript>}) expect(rendered).not_to include('_paq.push(["disableCookies"])') end @@ -120,6 +120,6 @@ RSpec.describe 'layouts/_head' do def stub_helper_with_safe_string(method) allow_any_instance_of(PageLayoutHelper).to receive(method) - .and_return(%q{foo" http-equiv="refresh}.html_safe) + .and_return(%q(foo" http-equiv="refresh).html_safe) end end diff --git a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb index 005283f66da..34debcab5f7 100644 --- a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb +++ b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb @@ -32,7 +32,7 @@ RSpec.describe 'layouts/nav/sidebar/_project', feature_category: :navigation do it 'has a link to the project activity path' do render - expect(rendered).to have_link('Project information', href: activity_project_path(project), class: %w(shortcuts-project-information)) + expect(rendered).to have_link('Project information', href: activity_project_path(project), class: %w[shortcuts-project-information]) expect(rendered).to have_selector('[aria-label="Project information"]') end diff --git a/spec/views/projects/commit/branches.html.haml_spec.rb b/spec/views/projects/commit/branches.html.haml_spec.rb index f1064be3047..d6fbf6453c0 100644 --- a/spec/views/projects/commit/branches.html.haml_spec.rb +++ b/spec/views/projects/commit/branches.html.haml_spec.rb @@ -61,7 +61,7 @@ RSpec.describe 'projects/commit/branches.html.haml' do before do assign(:branches, ['master']) assign(:branches_limit_exceeded, true) - assign(:tags, %w(tag1 tag2)) + assign(:tags, %w[tag1 tag2]) assign(:tags_limit_exceeded, false) render |