jquery-rails 3.0.4 → 4.4.0

data/lib/jquery/assert_select.rb

@@ -1,99 +1,151 @@
-module ActionDispatch
-  module Assertions
-    module SelectorAssertions
-      # Selects content from a JQuery response.  Patterned loosely on
-      # assert_select_rjs.
-      #
-      # === Narrowing down
-      #
-      # With no arguments, asserts that one or more method calls are made.
-      #
-      # Use the +method+ argument to narrow down the assertion to only
-      # statements that call that specific method.
-      #
-      # Use the +opt+ argument to narrow down the assertion to only statements
-      # that pass +opt+ as the first argument.
-      #
-      # Use the +id+ argument to narrow down the assertion to only statements
-      # that invoke methods on the result of using that identifier as a
-      # selector.
-      #
-      # === Using blocks
-      #
-      # Without a block, +assert_select_jquery_ merely asserts that the
-      # response contains one or more statements that match the conditions
-      # specified above
-      #
-      # With a block +assert_select_jquery_ also asserts that the method call
-      # passes a javascript escaped string containing HTML.  All such HTML
-      # fragments are selected and passed to the block.  Nested assertions are
-      # supported.
-      #
-      # === Examples
-      #
-      # # asserts that the #notice element is hidden
-      # assert_select :hide, '#notice'
-      #
-      # # asserts that the #cart element is shown with a blind parameter
-      # assert_select :show, :blind, '#cart'
-      #
-      # # asserts that #cart content contains a #current_item
-      # assert_select :html, '#cart' do
-      #   assert_select '#current_item'
-      # end
-
-      PATTERN_HTML  = "\"((\\\\\"|[^\"])*)\""
-      PATTERN_UNICODE_ESCAPED_CHAR = /\\u([0-9a-zA-Z]{4})/
-
-      def assert_select_jquery(*args, &block)
-        jquery_method = args.first.is_a?(Symbol) ? args.shift : nil
-        jquery_opt    = args.first.is_a?(Symbol) ? args.shift : nil
-        id            = args.first.is_a?(String) ? args.shift : nil
-
-        pattern = "\\.#{jquery_method || '\\w+'}\\("
-        pattern = "#{pattern}['\"]#{jquery_opt}['\"],?\\s*" if jquery_opt
-        pattern = "#{pattern}#{PATTERN_HTML}"
-        pattern = "(?:jQuery|\\$)\\(['\"]#{id}['\"]\\)#{pattern}" if id
-
-        fragments = []
-        response.body.scan(Regexp.new(pattern)).each do |match|
-          doc = HTML::Document.new(unescape_js(match.first))
-          doc.root.children.each do |child|
-            fragments.push child if child.tag?
-          end
-        end
+require 'rails/dom/testing/assertions/selector_assertions'
 
-        if fragments.empty?
-          opts = [jquery_method, jquery_opt, id].compact
-          flunk "No JQuery call matches #{opts.inspect}"
-        end
+module Rails::Dom::Testing::Assertions::SelectorAssertions
+  # Selects content from a JQuery response.  Patterned loosely on
+  # assert_select_rjs.
+  #
+  # === Narrowing down
+  #
+  # With no arguments, asserts that one or more method calls are made.
+  #
+  # Use the +method+ argument to narrow down the assertion to only
+  # statements that call that specific method.
+  #
+  # Use the +opt+ argument to narrow down the assertion to only statements
+  # that pass +opt+ as the first argument.
+  #
+  # Use the +id+ argument to narrow down the assertion to only statements
+  # that invoke methods on the result of using that identifier as a
+  # selector.
+  #
+  # === Using blocks
+  #
+  # Without a block, +assert_select_jquery_ merely asserts that the
+  # response contains one or more statements that match the conditions
+  # specified above
+  #
+  # With a block +assert_select_jquery_ also asserts that the method call
+  # passes a javascript escaped string containing HTML.  All such HTML
+  # fragments are selected and passed to the block.  Nested assertions are
+  # supported.
+  #
+  # === Examples
+  #
+  # # asserts that the #notice element is hidden
+  # assert_select :hide, '#notice'
+  #
+  # # asserts that the #cart element is shown with a blind parameter
+  # assert_select :show, :blind, '#cart'
+  #
+  # # asserts that #cart content contains a #current_item
+  # assert_select :html, '#cart' do
+  #   assert_select '#current_item'
+  # end
+  #
+  # # asserts that #product append to a #product_list
+  # assert_select_jquery :appendTo, '#product_list' do
+  #   assert_select '.product'
+  # end
+
+  PATTERN_HTML  = "['\"]((\\\\\"|\\\\'|[^\"'])*)['\"]"
+  PATTERN_UNICODE_ESCAPED_CHAR = /\\u([0-9a-zA-Z]{4})/
+  SKELETAL_PATTERN = "(?:jQuery|\\$)\\(%s\\)\\.%s\\(%s\\)[;]?"
+
+  def assert_select_jquery(*args, &block)
+    jquery_method = args.first.is_a?(Symbol) ? args.shift : nil
+    jquery_opt    = args.first.is_a?(Symbol) ? args.shift : nil
+    id            = args.first.is_a?(String) ? escape_id(args.shift) : nil
+
+    target_pattern   = "['\"]#{id || '.*'}['\"]"
+    method_pattern   = "#{jquery_method || '\\w+'}"
+    argument_pattern = jquery_opt ? "['\"]#{jquery_opt}['\"].*" : PATTERN_HTML
+
+    # $("#id").show('blind', 1000);
+    # $("#id").html("<div>something</div>");
+    # $("#id").replaceWith("<div>something</div>");
+    target_as_receiver_pattern = SKELETAL_PATTERN % [target_pattern, method_pattern, argument_pattern]
+
+    # $("<div>something</div>").appendTo("#id");
+    # $("<div>something</div>").prependTo("#id");
+    target_as_argument_pattern = SKELETAL_PATTERN % [argument_pattern, method_pattern, target_pattern]
+
+    # $("#id").remove();
+    # $("#id").hide();
+    argumentless_pattern = SKELETAL_PATTERN % [target_pattern, method_pattern, '']
+
+    patterns = [target_as_receiver_pattern, target_as_argument_pattern]
+    patterns << argumentless_pattern unless jquery_opt
+
+    matched_pattern = nil
+    patterns.each do |pattern|
+      if response.body.match(Regexp.new(pattern))
+        matched_pattern = pattern
+        break
+      end
+    end
 
-        if block
-          begin
-            in_scope, @selected = @selected, fragments
-            yield
-          ensure
-            @selected = in_scope
+    unless matched_pattern
+      opts = [jquery_method, jquery_opt, id].compact
+      flunk "No JQuery call matches #{opts.inspect}"
+    end
+
+    if block_given?
+      @selected ||= nil
+      fragments = Nokogiri::HTML::Document.new.fragment
+
+      if matched_pattern
+        response.body.scan(Regexp.new(matched_pattern)).each do |match|
+          flunk 'This function can\'t have HTML argument' if match.is_a?(String)
+
+          doc = Nokogiri::HTML::DocumentFragment.parse(unescape_js(match.first))
+          doc.children.each do |child|
+            fragments << child if child.element?
           end
         end
       end
 
-    private
-
-      # Unescapes a JS string.
-      def unescape_js(js_string)
-        # js encodes double quotes and line breaks.
-        unescaped= js_string.gsub('\"', '"')
-        unescaped.gsub!('\\\'', "'")
-        unescaped.gsub!(/\\\//, '/')
-        unescaped.gsub!('\n', "\n")
-        unescaped.gsub!('\076', '>')
-        unescaped.gsub!('\074', '<')
-        # js encodes non-ascii characters.
-        unescaped.gsub!(PATTERN_UNICODE_ESCAPED_CHAR) {|u| [$1.hex].pack('U*')}
-        unescaped
+      begin
+        in_scope, @selected = @selected, fragments
+        yield
+      ensure
+        @selected = in_scope
       end
-
     end
   end
+
+  private
+
+    # Unescapes a JS string.
+    def unescape_js(js_string)
+      # js encodes double quotes and line breaks.
+      unescaped= js_string.gsub('\"', '"')
+      unescaped.gsub!('\\\'', "'")
+      unescaped.gsub!(/\\\//, '/')
+      unescaped.gsub!('\n', "\n")
+      unescaped.gsub!('\076', '>')
+      unescaped.gsub!('\074', '<')
+      unescaped.gsub!(/\\\$/, '$')
+      unescaped.gsub!(/\\`/, '`')
+      # js encodes non-ascii characters.
+      unescaped.gsub!(PATTERN_UNICODE_ESCAPED_CHAR) {|u| [$1.hex].pack('U*')}
+      unescaped
+    end
+
+    def escape_id(selector)
+      return unless selector
+
+      id = selector.gsub('[', '\[')
+      id.gsub!(']', '\]')
+      id.gsub!('*', '\*')
+      id.gsub!('(', '\(')
+      id.gsub!(')', '\)')
+      id.gsub!('.', '\.')
+      id.gsub!('|', '\|')
+      id.gsub!('^', '\^')
+      id.gsub!('$', '\$')
+      id.gsub!('+', "\\\\+")
+      id.gsub!(',', '\,')
+
+      id
+    end
 end

data/lib/jquery/rails/version.rb

@@ -1,7 +1,9 @@
 module Jquery
   module Rails
-    VERSION = "3.0.4"
-    JQUERY_VERSION = "1.10.2"
-    JQUERY_UJS_VERSION = "e9e8b8fd3abb1571781bca7640e5c0c4d9cea2e3"
+    VERSION = "4.4.0"
+    JQUERY_VERSION = "1.12.4"
+    JQUERY_2_VERSION = "2.2.4"
+    JQUERY_3_VERSION = "3.5.1"
+    JQUERY_UJS_VERSION = "1.2.2"
   end
 end

data/lib/jquery/rails.rb

@@ -1,10 +1,8 @@
 require 'jquery/assert_select' if ::Rails.env.test?
-require 'jquery/rails/engine' if ::Rails.version >= '3.1'
-require 'jquery/rails/railtie'
+require 'jquery/rails/engine'
 require 'jquery/rails/version'
 
 module Jquery
   module Rails
-    PROTOTYPE_JS = %w{prototype effects dragdrop controls}
   end
 end

data/test/assert_select_jquery_test.rb

@@ -0,0 +1,91 @@
+require 'ostruct'
+require_relative 'test_helper'
+require_relative '../lib/jquery/assert_select'
+
+class AssertSelectJQueryTest < ActiveSupport::TestCase
+  include Rails::Dom::Testing::Assertions::SelectorAssertions
+  attr_reader :response
+
+  JAVASCRIPT_TEST_OUTPUT = <<-JS
+    $("#card").show("blind", 1000);
+    $("#id").html('<div><p>something</p></div>');
+    $('#card').html('<div><p>something else</p></div>');
+    jQuery("#id").replaceWith("<div><p>something</p></div>");
+    $("<div><p>something</p></div>").appendTo("#id");
+    $("<div><p>something else</p></div>").appendTo("#id");
+    jQuery("<div><p>something</p></div>").prependTo("#id");
+    $('#id').remove();
+    jQuery("#id").hide();
+    $("[data-placeholder~=name]").remove();
+    $("#cart tr:not(.total_line) > *").remove();
+    $("[href|=\"val\"][href$=\"val\"][href^=\"val\"]").remove();
+    $("tr + td, li").remove();
+
+    // without semicolon
+    $("#browser_cart").hide("blind", 1000)
+
+    $('#item').html('<div><span>\\`Total\\`: \\$12.34</span></div>');
+  JS
+
+  setup do
+    @response = OpenStruct.new(content_type: 'text/javascript', body: JAVASCRIPT_TEST_OUTPUT)
+  end
+
+  def test_target_as_receiver
+    assert_nothing_raised do
+      assert_select_jquery :show, :blind, '#card'
+      assert_select_jquery :hide, :blind, '#browser_cart'
+      assert_select_jquery :html, '#id' do
+        assert_select 'p', 'something'
+      end
+      assert_select_jquery :replaceWith, '#id' do
+        assert_select 'p', 'something'
+      end
+      assert_select_jquery :remove, "[data-placeholder~=name]"
+      assert_select_jquery :remove, "#cart tr:not(.total_line) > *"
+      assert_select_jquery :remove, "[href|=\"val\"][href$=\"val\"][href^=\"val\"]"
+      assert_select_jquery :remove, "tr + td, li"
+
+      assert_select_jquery :html, '#item' do
+        assert_select 'span', '`Total`: $12.34'
+      end
+    end
+
+    assert_raise Minitest::Assertion, "No JQuery call matches [:show, :some_wrong]" do
+      assert_select_jquery :show, :some_wrong
+    end
+
+    assert_raise Minitest::Assertion, "<something else> was expected but was <something>" do
+      assert_select_jquery :html, '#id' do
+        assert_select 'p', 'something else'
+      end
+    end
+  end
+
+  def test_target_as_argument
+    assert_nothing_raised do
+      assert_select_jquery :appendTo, '#id' do
+        assert_select 'p', 'something'
+        assert_select 'p', 'something else'
+      end
+      assert_select_jquery :prependTo, '#id' do
+        assert_select 'p', 'something'
+      end
+    end
+
+    assert_raise Minitest::Assertion, 'No JQuery call matches [:prependTo, "#wrong_id"]' do
+      assert_select_jquery :prependTo, '#wrong_id'
+    end
+  end
+
+  def test_argumentless
+    assert_nothing_raised do
+      assert_select_jquery :remove
+      assert_select_jquery :hide
+    end
+
+    assert_raise Minitest::Assertion, 'No JQuery call matches [:wrong_function]' do
+      assert_select_jquery :wrong_function
+    end
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,6 @@
+require 'nokogiri'
+require 'active_support'
+require 'active_support/test_case'
+require 'minitest/autorun'
+
+ActiveSupport::TestCase.test_order = :random