Merge pull request #8158 from opf/bump/ckeditor17

Bump CKEditor to 17.0
pull/8162/head
Oliver Günther 5 years ago committed by GitHub
commit 8a875562e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1414
      app/assets/javascripts/vendor/ckeditor/ckeditor.js
  2. 2
      app/assets/javascripts/vendor/ckeditor/ckeditor.js.map
  3. 10
      spec/features/work_packages/details/inplace_editor/shared_examples.rb
  4. 2
      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

@ -145,20 +145,18 @@ shared_examples 'a principal autocomplete field' do
it 'autocompletes links to user profiles' do
field.activate!
field.clear with_backspace: true
field.input_element.set(" @lau")
field.input_element.send_keys(" @lau")
expect(page).to have_selector('.mention-list-item', text: mentioned_user.name)
expect(page).to have_selector('.mention-list-item', text: mentioned_group.name)
expect(page).not_to have_selector('.mention-list-item', text: user.name)
# Close the autocompleter
field.input_element.send_keys :escape
field.ckeditor.clear
# Clear the field
sleep(0.01)
field.clear with_backspace: true
sleep(0.01)
sleep 2
field.input_element.set(" @Laura Fo")
field.ckeditor.type_slowly '@Laura'
expect(page).to have_selector('.mention-list-item', text: mentioned_user.name)
expect(page).not_to have_selector('.mention-list-item', text: mentioned_group.name)
expect(page).not_to have_selector('.mention-list-item', text: user.name)

@ -44,7 +44,7 @@ describe 'Wysiwyg code block macro', type: :feature, js: true do
let(:expected) {
<<~EXPECTED
```ruby
#{snippet}
#{snippet.strip}
```
EXPECTED
}

Loading…
Cancel
Save