Skip to content

Rails 6.0 Support #46

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

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open

Rails 6.0 Support #46

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
e7fa1fe
config.action_view.debug_rjs was removed
korny Jun 10, 2011
d7c0042
start on 4.2 support
tenderlove Nov 14, 2014
bfec473
Merge branch 'master' into 4.2
Jan 27, 2015
305fca4
Fixed deprecation warning "ActionDispatch::Assertions::SelectorAssert…
Mar 11, 2015
0fed929
Merge pull request #36 from Nike0/4.2
rafaelfranca Mar 12, 2015
eb9632d
Update to allow Rails 5
Mar 13, 2017
04c4dea
Fix deprecation
Mar 13, 2017
0bdf18d
Fix deprecated reference
Mar 20, 2017
decebc3
Move to Module#prepend in prep for for Rails 5.1
Apr 6, 2017
45e4852
update_page fragments are marked as html_safe even though they have n…
esb Jan 11, 2013
8ddd03c
include the X-CSRF-Token header with every Ajax request
esb Jan 12, 2013
b7718ba
Reapply the actionpack 2.2 fix for disable-with, the original submit …
esb Jan 12, 2013
524b86a
Make click event handler on a elements only respond to left clicks
esb Jan 13, 2013
98db453
Ensure onclick handlers are escaped only once
esb Jan 15, 2013
d554af6
Update rails gem
May 22, 2017
9f639a3
Don't disable *every* submit field, just the one that has been clicked
May 22, 2017
a2fbb9c
Passed along any original 'target' attribute to the generated form ta…
Jun 15, 2017
2f58665
CI-1376 Get rid of disableFormElements content
Aug 3, 2017
3902627
Revert "CI-1376 Get rid of disableFormElements content"
binary-koan Aug 13, 2017
d07c95b
CI-1614 Restore disabling of form submit buttons
binary-koan Aug 13, 2017
e7f8e04
Merge pull request #3 from fluxfederation/ci-1614
binary-koan Nov 20, 2017
07b2003
Merge remote-tracking branch 'upstream/master'
korny Apr 11, 2022
f570d7f
Merge remote-tracking branch 'fluxfederation/rails-5.0' into rails-6.0
korny Apr 11, 2022
c96372e
tweaks for Rails 6.0
korny Apr 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
start on 4.2 support
  • Loading branch information
@tenderlove
tenderlove committed Nov 14, 2014
commit d7c0042224853eeb65a4a4eb49cc2b3eca08bd91
6 changes: 3 additions & 3 deletions lib/prototype-rails/selector_assertions.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
require 'active_support/core_ext/module/aliasing'
require 'action_view/vendor/html-scanner'
require 'action_dispatch/testing/assertions'
require 'action_dispatch/testing/assertions/selector'

Expand All @@ -8,7 +7,8 @@
# Under MIT and/or CC By license.
#++

ActionDispatch::Assertions::SelectorAssertions.module_eval do
module PrototypeRails
module SelectorAssertions
# Selects content from the RJS response.
#
# === Narrowing down
Expand Down Expand Up @@ -193,7 +193,6 @@ def response_from_page_with_rjs
response_from_page_without_rjs
end
end
alias_method_chain :response_from_page, :rjs

# Unescapes a RJS string.
def unescape_rjs(rjs_string)
Expand All @@ -208,3 +207,4 @@ def unescape_rjs(rjs_string)
unescaped
end
end
end