diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 23:02:30 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 23:02:30 +0300 |
commit | 41fe97390ceddf945f3d967b8fdb3de4c66b7dea (patch) | |
tree | 9c8d89a8624828992f06d892cd2f43818ff5dcc8 /spec/features/markdown | |
parent | 0804d2dc31052fb45a1efecedc8e06ce9bc32862 (diff) |
Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42
Diffstat (limited to 'spec/features/markdown')
-rw-r--r-- | spec/features/markdown/copy_as_gfm_spec.rb | 9 | ||||
-rw-r--r-- | spec/features/markdown/keyboard_shortcuts_spec.rb | 8 | ||||
-rw-r--r-- | spec/features/markdown/sandboxed_mermaid_spec.rb | 2 |
3 files changed, 12 insertions, 7 deletions
diff --git a/spec/features/markdown/copy_as_gfm_spec.rb b/spec/features/markdown/copy_as_gfm_spec.rb index 6951d8298e5..d472134a2c7 100644 --- a/spec/features/markdown/copy_as_gfm_spec.rb +++ b/spec/features/markdown/copy_as_gfm_spec.rb @@ -7,10 +7,6 @@ RSpec.describe 'Copy as GFM', :js do include RepoHelpers include ActionView::Helpers::JavaScriptHelper - before do - stub_feature_flags(refactor_blob_viewer: false) # This stub will be removed in https://gitlab.com/gitlab-org/gitlab/-/issues/350454 - end - describe 'Copying rendered GFM' do before do @feat = MarkdownFeature.new @@ -764,8 +760,8 @@ RSpec.describe 'Copy as GFM', :js do context 'selecting one word of text' do it 'copies as inline code' do verify( - '.line[id="LC9"] .no', - '`RuntimeError`' + '.line[id="LC10"]', + '`end`' ) end end @@ -834,6 +830,7 @@ RSpec.describe 'Copy as GFM', :js do end def verify(selector, gfm, target: nil) + expect(page).to have_selector('.js-syntax-highlight') html = html_for_selector(selector) output_gfm = html_to_gfm(html, 'transformCodeSelection', target: target) wait_for_requests diff --git a/spec/features/markdown/keyboard_shortcuts_spec.rb b/spec/features/markdown/keyboard_shortcuts_spec.rb index 81b1928658c..82288af1f9f 100644 --- a/spec/features/markdown/keyboard_shortcuts_spec.rb +++ b/spec/features/markdown/keyboard_shortcuts_spec.rb @@ -37,6 +37,14 @@ RSpec.describe 'Markdown keyboard shortcuts', :js do expect(markdown_field.value).to eq('_italic_') end + it 'strikes text when <modifier>+<shift>+x is pressed' do + type_and_select('strikethrough') + + markdown_field.send_keys([modifier_key, :shift, 'x']) + + expect(markdown_field.value).to eq('~~strikethrough~~') + end + it 'links text when <modifier>+K is pressed' do type_and_select('link') diff --git a/spec/features/markdown/sandboxed_mermaid_spec.rb b/spec/features/markdown/sandboxed_mermaid_spec.rb index f118fb3db66..05fe83b3107 100644 --- a/spec/features/markdown/sandboxed_mermaid_spec.rb +++ b/spec/features/markdown/sandboxed_mermaid_spec.rb @@ -26,7 +26,7 @@ RSpec.describe 'Sandboxed Mermaid rendering', :js do wait_for_requests - expected = %(<iframe src="/-/sandbox/mermaid" sandbox="allow-scripts" frameborder="0" scrolling="no") + expected = %(<iframe src="/-/sandbox/mermaid" sandbox="allow-scripts allow-popups" frameborder="0" scrolling="no") expect(page.html).to include(expected) end end |