From 8b22725c782a65b2222f7a9ffed6d241c599f2e6 Mon Sep 17 00:00:00 2001
From: ta1kt0me <p.wadachi@gmail.com>
Date: Sat, 28 Oct 2017 11:51:21 +0900
Subject: Enable to call Rails.ajax without beforeSend

---
 actionview/test/ujs/public/test/call-ajax.js   | 27 ++++++++++++++++++++++++++
 actionview/test/ujs/views/tests/index.html.erb |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 actionview/test/ujs/public/test/call-ajax.js

(limited to 'actionview/test')

diff --git a/actionview/test/ujs/public/test/call-ajax.js b/actionview/test/ujs/public/test/call-ajax.js
new file mode 100644
index 0000000000..49e64cad5c
--- /dev/null
+++ b/actionview/test/ujs/public/test/call-ajax.js
@@ -0,0 +1,27 @@
+(function() {
+
+module('call-ajax', {
+  setup: function() {
+    $('#qunit-fixture')
+      .append($('<a />', { href: '#' }))
+  }
+})
+
+asyncTest('call ajax without "ajax:beforeSend"', 1, function() {
+
+  var link = $('#qunit-fixture a')
+  link.bindNative('click', function() {
+    Rails.ajax({
+      type: 'get',
+      url: '/',
+      success: function() {
+        ok(true, 'calling request in ajax:success')
+      }
+    })
+  })
+
+  link.triggerNative('click')
+  setTimeout(function() { start() }, 13)
+})
+
+})()
diff --git a/actionview/test/ujs/views/tests/index.html.erb b/actionview/test/ujs/views/tests/index.html.erb
index 8de6cd0695..6b16535216 100644
--- a/actionview/test/ujs/views/tests/index.html.erb
+++ b/actionview/test/ujs/views/tests/index.html.erb
@@ -1,6 +1,6 @@
 <% @title = "rails-ujs test" %>
 
-<%= test_to 'data-confirm', 'data-remote', 'data-disable', 'data-disable-with', 'call-remote', 'call-remote-callbacks', 'data-method', 'override', 'csrf-refresh', 'csrf-token' %>
+<%= test_to 'data-confirm', 'data-remote', 'data-disable', 'data-disable-with', 'call-remote', 'call-remote-callbacks', 'data-method', 'override', 'csrf-refresh', 'csrf-token', 'call-ajax' %>
 
 <h1 id="qunit-header"><%= @title %></h1>
 <h2 id="qunit-banner"></h2>
-- 
cgit v1.2.3


From d5defda77f3d941f238c35eae12146d5d4737e54 Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Thu, 2 Nov 2017 09:58:54 +0900
Subject: Fix "warning: instance variable @defined_root not initialized"

Currently, the following error is shows only when run the test using
`bin/test`.

```
./bin/test -w test/template/log_subscriber_test.rb
Run options: --seed 17167

# Running:

/rails/actionview/test/template/log_subscriber_test.rb:34: warning: instance variable @defined_root not initialized
```

In `AVLogSubscriberTest`, if the `Rails.root` is not defined, define the
method and undef it in teardown.
https://github.com/rails/rails/blob/master/actionview/test/template/log_subscriber_test.rb#L21..L33

However, in `bin/test`, `Rails.root` is defined, which results in referring to
uninitialized variables and warnings.
---
 actionview/test/template/log_subscriber_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionview/test')

diff --git a/actionview/test/template/log_subscriber_test.rb b/actionview/test/template/log_subscriber_test.rb
index a4d89ba0d1..7f4fd25573 100644
--- a/actionview/test/template/log_subscriber_test.rb
+++ b/actionview/test/template/log_subscriber_test.rb
@@ -30,7 +30,7 @@ class AVLogSubscriberTest < ActiveSupport::TestCase
     ActiveSupport::LogSubscriber.log_subscribers.clear
 
     # We need to undef `root`, RenderTestCases don't want this to be defined
-    Rails.instance_eval { undef :root } if @defined_root
+    Rails.instance_eval { undef :root } if defined?(@defined_root)
   end
 
   def set_logger(logger)
-- 
cgit v1.2.3