Revert "bump ckeditor to 11.1.1"

pull/6769/head
Oliver Günther 6 years ago committed by GitHub
parent 2922097fee
commit a5b0764638
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      app/assets/javascripts/vendor/ckeditor/ckeditor.js
  2. 2
      app/assets/javascripts/vendor/ckeditor/ckeditor.js.map
  3. 3
      spec/features/boards/attachment_upload_spec.rb
  4. 2
      spec/features/wiki/attachment_upload_spec.rb
  5. 1
      spec/features/wysiwyg/macros/code_block_macro_spec.rb

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -58,8 +58,6 @@ describe 'Upload attachment to board message', js: true do
# adding an image
editor.in_editor do |container, editable|
editable.base.send_keys('Some text')
attachments.drag_and_drop_file(editable, image_fixture)
# Besides testing caption functionality this also slows down clicking on the submit button
@ -81,7 +79,6 @@ describe 'Upload attachment to board message', js: true do
end
editor.in_editor do |container, editable|
editable.base.send_keys(:page_up, 'some text', :enter, :enter, :enter)
attachments.drag_and_drop_file(editable, image_fixture)
# Besides testing caption functionality this also slows down clicking on the submit button

@ -73,7 +73,7 @@ describe 'Upload attachment to wiki page', js: true do
end
# Replace one image with a named attachment URL (Regression #28381)
editor.set_markdown "![my-first-image](image.png)\n\nText that prevents the two images colliding"
editor.set_markdown "![my-first-image](image.png)"
editor.in_editor do |container, editable|
# Expect URL is mapped to the correct URL

@ -60,6 +60,7 @@ describe 'Wysiwyg code block macro', type: :feature, js: true do
end
it 'can add and save multiple code blocks (Regression #28350)' do
editor.in_editor do |container,|
editor.set_markdown expected

Loading…
Cancel
Save