Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport] Bring back CKEditor images button #2977

Merged
merged 1 commit into from
Oct 17, 2018
Merged

[Backport] Bring back CKEditor images button #2977

merged 1 commit into from
Oct 17, 2018

Conversation

javierm
Copy link
Member

@javierm javierm commented Oct 17, 2018

References

@javierm
Bring back CKEditor images button
6f96265 
It was accidentally deleted in commit 914bfa6.

Note the following spec passes on my machine if we add a `sleep 0.1`
call in the `:wait_readable` part of ruby's `Net::Protocol#rbuf_fill`.
Otherwise, it hangs forever after clicking the `.fileupload-file` div,
which closes its window. It might be solved when upgrading rails,
capybara, selenium or chromedriver.

scenario "Allows images in CKEditor", :js do
  visit edit_admin_site_customization_page_path(custom_page)

  within(".ckeditor") do
    within_frame(0) { expect(page).not_to have_css("img") }

    expect(page).to have_css(".cke_toolbar .cke_button__image_icon")
    find(".cke_toolbar .cke_button__image_icon").click
  end

  within_window(window_opened_by { click_link "Browse Server" }) do
    attach_file :file,
                Rails.root.join('spec/fixtures/files/clippy.jpg'),
                visible: false
    find(".fileupload-file").click
  end

  click_link "OK"

  within(".ckeditor") do
    within_frame(0) { expect(page).to have_css("img") }
  end
end
@javierm javierm merged commit e117218 into master Oct 17, 2018
@voodoorai2000 voodoorai2000 deleted the backport-reenable_ckeditor_images branch October 31, 2018 13:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@voodoorai2000 voodoorai2000 voodoorai2000 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@javierm @voodoorai2000