Add UJS tests

22 files changed, 5280 insertions, 0 deletions

diff --git a/actionview/RUNNING_UJS_TESTS.rdoc b/actionview/RUNNING_UJS_TESTS.rdoc
new file mode 100644
index 0000000000..cbf6bdccc6
--- /dev/null
+++ b/actionview/RUNNING_UJS_TESTS.rdoc
@@ -0,0 +1,7 @@
+== Running UJS tests
+
+Ensure that you can build the project and run tests.
+Run rake ujs:server first, and then run the web tests by
+visiting http://localhost:4567 in your browser.
+
+rake test:server
diff --git a/actionview/Rakefile b/actionview/Rakefile
index 6c3fc59b0a..7a66119488 100644
--- a/actionview/Rakefile
+++ b/actionview/Rakefile
@@ -46,6 +46,13 @@ namespace :test do
   end
 end
 
+namespace :ujs do
+  desc "Starts the test server"
+  task :server do
+    system 'bundle exec rackup test/ujs/config.ru -p 4567 -s puma'
+  end
+end
+
 task :lines do
   load File.expand_path("..", File.dirname(__FILE__)) + "/tools/line_statistics"
   files = FileList["lib/**/*.rb"]
diff --git a/actionview/test/ujs/.gitignore b/actionview/test/ujs/.gitignore
new file mode 100644
index 0000000000..31dbbff57c
--- /dev/null
+++ b/actionview/test/ujs/.gitignore
@@ -0,0 +1 @@
+/log
diff --git a/actionview/test/ujs/config.ru b/actionview/test/ujs/config.ru
new file mode 100644
index 0000000000..cb961dc140
--- /dev/null
+++ b/actionview/test/ujs/config.ru
@@ -0,0 +1,3 @@
+$LOAD_PATH.unshift File.expand_path('..', __FILE__)
+require 'server'
+run UJS::Server
diff --git a/actionview/test/ujs/public/test/.eslintrc.yml b/actionview/test/ujs/public/test/.eslintrc.yml
new file mode 100644
index 0000000000..06d7dd36ea
--- /dev/null
+++ b/actionview/test/ujs/public/test/.eslintrc.yml
@@ -0,0 +1,21 @@
+env:
+  browser: true
+extends: eslint:recommended
+rules:
+  no-undef: off
+  no-unused-vars: off
+  indent: off
+  linebreak-style: ['error', 'unix']
+  quotes: ['error', 'single']
+  semi: ['error', 'never']
+  no-shadow: ['error'] # Prevent potential errors
+  no-console: 'off'
+  # styles
+  space-before-function-paren: ['error', 'never']
+  space-before-blocks: 'error'
+  brace-style: ['error', '1tbs', { allowSingleLine: true }]
+  key-spacing: 'error'
+  array-bracket-spacing: 'error'
+  comma-spacing: 'error'
+  comma-dangle: 'off'
+  eol-last: 'error'
diff --git a/actionview/test/ujs/public/test/call-remote-callbacks.js b/actionview/test/ujs/public/test/call-remote-callbacks.js
new file mode 100644
index 0000000000..082d10bfbd
--- /dev/null
+++ b/actionview/test/ujs/public/test/call-remote-callbacks.js
@@ -0,0 +1,469 @@
+(function() {
+
+module('call-remote-callbacks', {
+  setup: function() {
+    $('#qunit-fixture').append($('<form />', {
+      action: '/echo', method: 'get', 'data-remote': 'true'
+    }))
+  },
+  teardown: function() {
+    $(document).undelegate('form[data-remote]', 'ajax:beforeSend')
+    $(document).undelegate('form[data-remote]', 'ajax:before')
+    $(document).undelegate('form[data-remote]', 'ajax:send')
+    $(document).undelegate('form[data-remote]', 'ajax:complete')
+    $(document).undelegate('form[data-remote]', 'ajax:success')
+    $(document).unbind('ajaxStop')
+    $(document).unbind('iframe:loading')
+  }
+})
+
+function start_after_submit(form) {
+  form.bindNative('ajax:complete', function() {
+    ok(true, 'ajax:complete')
+    start()
+  })
+}
+
+function submit(fn) {
+  var form = $('form')
+  start_after_submit(form)
+
+  if (fn) fn(form)
+  form.triggerNative('submit')
+}
+
+function submit_with_button(submit_button) {
+  var form = $('form')
+  start_after_submit(form)
+
+  submit_button.triggerNative('click')
+}
+
+asyncTest('modifying form fields with "ajax:before" sends modified data in request', 4, function() {
+  $('form[data-remote]')
+    .append($('<input type="text" name="user_name" value="john">'))
+    .append($('<input type="text" name="removed_user_name" value="john">'))
+    .bindNative('ajax:before', function() {
+      var form = $(this)
+      form
+        .append($('<input />', {name: 'other_user_name', value: 'jonathan'}))
+        .find('input[name="removed_user_name"]').remove()
+      form
+        .find('input[name="user_name"]').val('steve')
+    })
+
+  submit(function(form) {
+    form.bindNative('ajax:success', function(e, data, status, xhr) {
+      equal(data.params.user_name, 'steve', 'modified field value should have been submitted')
+      equal(data.params.other_user_name, 'jonathan', 'added field value should have been submitted')
+      equal(data.params.removed_user_name, undefined, 'removed field value should be undefined')
+    })
+  })
+})
+
+asyncTest('modifying data("type") with "ajax:before" requests new dataType in request', 2, function() {
+  $('form[data-remote]').data('type', 'html')
+    .bindNative('ajax:before', function() {
+      this.setAttribute('data-type', 'xml')
+    })
+
+  submit(function(form) {
+    form.bindNative('ajax:beforeSend', function(e, xhr, settings) {
+      equal(settings.dataType, 'xml', 'modified dataType should have been requested')
+    })
+  })
+})
+
+asyncTest('setting data("with-credentials",true) with "ajax:before" uses new setting in request', 2, function() {
+  $('form[data-remote]').data('with-credentials', false)
+    .bindNative('ajax:before', function() {
+      this.setAttribute('data-with-credentials', true)
+    })
+
+  submit(function(form) {
+    form.bindNative('ajax:beforeSend', function(e, xhr, settings) {
+      equal(settings.withCredentials, true, 'setting modified in ajax:before should have forced withCredentials request')
+    })
+  })
+})
+
+asyncTest('stopping the "ajax:beforeSend" event aborts the request', 1, function() {
+  submit(function(form) {
+    form.bindNative('ajax:beforeSend', function() {
+      ok(true, 'aborting request in ajax:beforeSend')
+      return false
+    })
+    form.unbind('ajax:send').bindNative('ajax:send', function() {
+      ok(false, 'ajax:send should not run')
+    })
+    form.unbind('ajax:complete').bindNative('ajax:complete', function() {
+      ok(false, 'ajax:complete should not run')
+    })
+    form.bindNative('ajax:error', function(e, xhr, status, error) {
+      ok(false, 'ajax:error should not run')
+    })
+    $(document).bindNative('ajaxStop', function() {
+      start()
+    })
+  })
+})
+
+asyncTest('blank required form input field should abort request and trigger "ajax:aborted:required" event', 5, function() {
+  $(document).bind('iframe:loading', function() {
+    ok(false, 'form should not get submitted')
+  })
+
+  var form = $('form[data-remote]')
+    .append($('<input type="text" name="user_name" required="required">'))
+    .append($('<textarea name="user_bio" required="required"></textarea>'))
+    .bindNative('ajax:beforeSend', function() {
+      ok(false, 'ajax:beforeSend should not run')
+    })
+    .bindNative('ajax:aborted:required', function(e, data) {
+      data = $(data)
+      ok(data.length == 2, 'ajax:aborted:required event is passed all blank required inputs (jQuery objects)')
+      ok(data.first().is('input[name="user_name"]'), 'ajax:aborted:required adds blank required input to data')
+      ok(data.last().is('textarea[name="user_bio"]'), 'ajax:aborted:required adds blank required textarea to data')
+      ok(true, 'ajax:aborted:required should run')
+    })
+    .triggerNative('submit')
+
+  setTimeout(function() {
+    form.find('input[required],textarea[required]').val('Tyler')
+    form.unbind('ajax:beforeSend')
+    submit()
+  }, 13)
+})
+
+asyncTest('blank required form input for non-remote form should abort normal submission', 1, function() {
+  var form = $('form[data-remote]')
+    .append($('<input type="text" name="user_name" required="required">'))
+    .removeAttr('data-remote')
+    .bindNative('ujs:everythingStopped', function() {
+      ok(true, 'ujs:everythingStopped should run')
+    })
+    .triggerNative('submit')
+
+  setTimeout(function() {
+    start()
+  }, 13)
+})
+
+asyncTest('form should be submitted with blank required fields if handler is bound to "ajax:aborted:required" event that returns false', 1, function() {
+  var form = $('form[data-remote]')
+    .append($('<input type="text" name="user_name" required="required">'))
+    .bindNative('ajax:beforeSend', function() {
+      ok(true, 'ajax:beforeSend should run')
+    })
+    .bindNative('ajax:aborted:required', function() {
+      return false
+    })
+    .triggerNative('submit')
+
+  setTimeout(function() {
+    start()
+  }, 13)
+})
+
+asyncTest('disabled fields should not be included in blank required check', 2, function() {
+  var form = $('form[data-remote]')
+    .append($('<input type="text" name="user_name" required="required" disabled="disabled">'))
+    .append($('<textarea name="user_bio" required="required" disabled="disabled"></textarea>'))
+    .bindNative('ajax:beforeSend', function() {
+      ok(true, 'ajax:beforeSend should run')
+    })
+    .bindNative('ajax:aborted:required', function() {
+      ok(false, 'ajax:aborted:required should not run')
+    })
+
+  submit()
+})
+
+asyncTest('form should be submitted with blank required fields if it has the "novalidate" attribute', 2, function() {
+  var form = $('form[data-remote]')
+    .append($('<input type="text" name="user_name" required="required">'))
+    .attr('novalidate', 'novalidate')
+    .bindNative('ajax:beforeSend', function() {
+      ok(true, 'ajax:beforeSend should run')
+    })
+    .bindNative('ajax:aborted:required', function() {
+      ok(false, 'ajax:aborted:required should not run')
+    })
+
+  submit()
+})
+
+asyncTest('form should be submitted with blank required fields if the button has the "formnovalidate" attribute', 2, function() {
+  var submit_button = $('<input type="submit" formnovalidate>')
+  var form = $('form[data-remote]')
+    .append($('<input type="text" name="user_name" required="required">'))
+    .append(submit_button)
+    .bindNative('ajax:beforeSend', function() {
+      ok(true, 'ajax:beforeSend should run')
+    })
+    .bindNative('ajax:aborted:required', function() {
+      ok(false, 'ajax:aborted:required should not run')
+    })
+
+  submit_with_button(submit_button)
+})
+
+asyncTest('blank required form input for non-remote form with "novalidate" attribute should not abort normal submission', 1, function() {
+  $(document).bind('iframe:loading', function() {
+    ok(true, 'form should get submitted')
+  })
+
+  var form = $('form[data-remote]')
+    .append($('<input type="text" name="user_name" required="required">'))
+    .removeAttr('data-remote')
+    .attr('novalidate', 'novalidate')
+    .triggerNative('submit')
+
+  setTimeout(function() {
+    start()
+  }, 13)
+})
+
+asyncTest('unchecked required checkbox should abort form submission', 1, function() {
+  var form = $('form[data-remote]')
+    .append($('<input type="checkbox" name="agree" required="required">'))
+    .removeAttr('data-remote')
+    .bindNative('ujs:everythingStopped', function() {
+      ok(true, 'ujs:everythingStopped should run')
+    })
+    .triggerNative('submit')
+
+  setTimeout(function() {
+    start()
+  }, 13)
+})
+
+asyncTest('unchecked required radio should abort form submission', 3, function() {
+  var form = $('form[data-remote]')
+    .append($('<input type="radio" name="yes_no_none" required="required" value=1>'))
+    .append($('<input type="radio" name="yes_no_none" required="required" value=2>'))
+    .removeAttr('data-remote')
+    .bindNative('ujs:everythingStopped', function() {
+      ok(true, 'ujs:everythingStopped should run')
+    })
+    .bindNative('ajax:aborted:required', function(e, data) {
+      data = $(data)
+      equal(data.length, 2, 'blankRequiredInputs should include both radios')
+      ok(data.first().is('input[type=radio][value=1]'), 'blankRequiredInputs[0] should be the first radio')
+    })
+    .triggerNative('submit')
+
+  setTimeout(function() {
+    start()
+  }, 13)
+})
+
+asyncTest('required radio should only require one to be checked', 1, function() {
+  $(document).bind('iframe:loading', function() {
+    ok(true, 'form should get submitted')
+  })
+
+  var form = $('form[data-remote]')
+    .append($('<input type="radio" name="yes_no" required="required" value=1 id="checkme">'))
+    .append($('<input type="radio" name="yes_no" required="required" value=2>'))
+    .removeAttr('data-remote')
+    .bindNative('ujs:everythingStopped', function() {
+      ok(false, 'ujs:everythingStopped should not run')
+    })
+    .find('#checkme').prop('checked', true)
+    .end()
+    .triggerNative('submit')
+
+  setTimeout(function() {
+    start()
+  }, 13)
+})
+
+asyncTest('required radio should only require one to be checked if not all radios are required', 1, function() {
+  $(document).bind('iframe:loading', function() {
+    ok(true, 'form should get submitted')
+  })
+
+  var form = $('form[data-remote]')
+    // Check the radio that is not required
+    .append($('<input type="radio" name="yes_no_maybe" value=1 >'))
+    // Check the radio that is not required
+    .append($('<input type="radio" name="yes_no_maybe" value=2 id="checkme">'))
+    // Only one needs to be required
+    .append($('<input type="radio" name="yes_no_maybe" required="required" value=3>'))
+    .removeAttr('data-remote')
+    .bindNative('ujs:everythingStopped', function() {
+      ok(false, 'ujs:everythingStopped should not run')
+    })
+    .find('#checkme').prop('checked', true)
+    .end()
+    .triggerNative('submit')
+
+  setTimeout(function() {
+    start()
+  }, 13)
+})
+
+function skipIt() {
+  // This test cannot work due to the security feature in browsers which makes the value
+  // attribute of file input fields readonly, so it cannot be set with default value.
+  // This is what the test would look like though if browsers let us automate this test.
+  asyncTest('non-blank file form input field should abort remote request, but submit normally', 5, function() {
+    var form = $('form[data-remote]')
+          .append($('<input type="file" name="attachment" value="default.png">'))
+          .bindNative('ajax:beforeSend', function() {
+            ok(false, 'ajax:beforeSend should not run')
+          })
+          .bind('iframe:loading', function() {
+            ok(true, 'form should get submitted')
+          })
+          .bindNative('ajax:aborted:file', function(e, data) {
+            ok(data.length == 1, 'ajax:aborted:file event is passed all non-blank file inputs (jQuery objects)')
+            ok(data.first().is('input[name="attachment"]'), 'ajax:aborted:file adds non-blank file input to data')
+            ok(true, 'ajax:aborted:file event should run')
+          })
+          .triggerNative('submit')
+
+    setTimeout(function() {
+      form.find('input[type="file"]').val('')
+      form.unbind('ajax:beforeSend')
+      submit()
+    }, 13)
+  })
+
+  asyncTest('file form input field should not abort remote request if file form input does not have a name attribute', 5, function() {
+    var form = $('form[data-remote]')
+          .append($('<input type="file" value="default.png">'))
+          .bindNative('ajax:beforeSend', function() {
+            ok(true, 'ajax:beforeSend should run')
+          })
+          .bind('iframe:loading', function() {
+            ok(true, 'form should get submitted')
+          })
+          .bindNative('ajax:aborted:file', function(e, data) {
+            ok(false, 'ajax:aborted:file should not run')
+          })
+          .triggerNative('submit')
+
+    setTimeout(function() {
+      form.find('input[type="file"]').val('')
+      form.unbind('ajax:beforeSend')
+      submit()
+    }, 13)
+  })
+
+  asyncTest('blank file input field should abort request entirely if handler bound to "ajax:aborted:file" event that returns false', 1, function() {
+    var form = $('form[data-remote]')
+          .append($('<input type="file" name="attachment" value="default.png">'))
+          .bindNative('ajax:beforeSend', function() {
+            ok(false, 'ajax:beforeSend should not run')
+          })
+          .bind('iframe:loading', function() {
+            ok(false, 'form should not get submitted')
+          })
+          .bindNative('ajax:aborted:file', function() {
+            return false
+          })
+          .triggerNative('submit')
+
+    setTimeout(function() {
+      form.find('input[type="file"]').val('')
+      form.unbind('ajax:beforeSend')
+      submit()
+    }, 13)
+  })
+}
+
+asyncTest('"ajax:beforeSend" can be observed and stopped with event delegation', 1, function() {
+  $(document).delegate('form[data-remote]', 'ajax:beforeSend', function() {
+    ok(true, 'ajax:beforeSend observed with event delegation')
+    return false
+  })
+
+  submit(function(form) {
+    form.unbind('ajax:send').bindNative('ajax:send', function() {
+      ok(false, 'ajax:send should not run')
+    })
+    form.unbind('ajax:complete').bindNative('ajax:complete', function() {
+      ok(false, 'ajax:complete should not run')
+    })
+    $(document).bindNative('ajaxStop', function() {
+      start()
+    })
+  })
+})
+
+asyncTest('"ajax:beforeSend", "ajax:send", "ajax:success" and "ajax:complete" are triggered', 9, function() {
+  submit(function(form) {
+    form.bindNative('ajax:beforeSend', function(e, xhr, settings) {
+      ok(xhr.setRequestHeader, 'first argument to "ajax:beforeSend" should be an XHR object')
+      equal(settings.url, '/echo', 'second argument to "ajax:beforeSend" should be a settings object')
+    })
+    form.bindNative('ajax:send', function(e, xhr) {
+      ok(xhr.abort, 'first argument to "ajax:send" should be an XHR object')
+    })
+    form.bindNative('ajax:success', function(e, data, status, xhr) {
+      ok(data.REQUEST_METHOD, 'first argument to ajax:success should be a data object')
+      equal(status, 'OK', 'second argument to ajax:success should be a status string')
+      ok(xhr.getResponseHeader, 'third argument to "ajax:success" should be an XHR object')
+    })
+    form.bindNative('ajax:complete', function(e, xhr, status) {
+      ok(xhr.getResponseHeader, 'first argument to "ajax:complete" should be an XHR object')
+      equal(status, 'OK', 'second argument to ajax:complete should be a status string')
+    })
+  })
+})
+
+if(window.phantom !== undefined) {
+  asyncTest('"ajax:beforeSend", "ajax:send", "ajax:error" and "ajax:complete" are triggered on error', 7, function() {
+    submit(function(form) {
+      form.attr('action', '/error')
+      form.bindNative('ajax:beforeSend', function(arg) { ok(true, 'ajax:beforeSend') })
+      form.bindNative('ajax:send', function(arg) { ok(true, 'ajax:send') })
+      form.bindNative('ajax:error', function(e, xhr, status, error) {
+        ok(xhr.getResponseHeader, 'first argument to "ajax:error" should be an XHR object')
+        equal(status, 'error', 'second argument to ajax:error should be a status string')
+        // Firefox 8 returns "Forbidden " with trailing space
+        equal($.trim(error), 'Forbidden', 'third argument to ajax:error should be an HTTP status response')
+        // Opera returns "0" for HTTP code
+        equal(xhr.status, window.opera ? 0 : 403, 'status code should be 403')
+      })
+    })
+  })
+}
+
+// IF THIS TEST IS FAILING, TRY INCREASING THE TIMEOUT AT THE BOTTOM TO > 100
+asyncTest('binding to ajax callbacks via .delegate() triggers handlers properly', 4, function() {
+  $(document)
+    .delegate('form[data-remote]', 'ajax:beforeSend', function() {
+      ok(true, 'ajax:beforeSend handler is triggered')
+    })
+    .delegate('form[data-remote]', 'ajax:send', function() {
+      ok(true, 'ajax:send handler is triggered')
+    })
+    .delegate('form[data-remote]', 'ajax:complete', function() {
+      ok(true, 'ajax:complete handler is triggered')
+    })
+    .delegate('form[data-remote]', 'ajax:success', function() {
+      ok(true, 'ajax:success handler is triggered')
+    })
+  $('form[data-remote]').triggerNative('submit')
+
+  setTimeout(function() {
+    start()
+  }, 63)
+})
+
+asyncTest('binding to ajax:send event to call jquery methods on ajax object', 2, function() {
+  $('form[data-remote]')
+    .bindNative('ajax:send', function(e, xhr) {
+      ok(true, 'event should fire')
+      equal(typeof(xhr.abort), 'function', 'event should pass jqXHR object')
+      xhr.abort()
+    })
+    .triggerNative('submit')
+
+  setTimeout(function() { start() }, 35)
+})
+
+})()
diff --git a/actionview/test/ujs/public/test/call-remote.js b/actionview/test/ujs/public/test/call-remote.js
new file mode 100644
index 0000000000..dbeb8ad832
--- /dev/null
+++ b/actionview/test/ujs/public/test/call-remote.js
@@ -0,0 +1,247 @@
+(function() {
+
+function buildForm(attrs) {
+  attrs = $.extend({ action: '/echo', 'data-remote': 'true' }, attrs)
+
+  $('#qunit-fixture').append($('<form />', attrs))
+    .find('form').append($('<input type="text" name="user_name" value="john">'))
+}
+
+module('call-remote')
+
+function submit(fn) {
+  $('form')
+    .bindNative('ajax:success', fn)
+    .bindNative('ajax:complete', function() { start() })
+    .triggerNative('submit')
+}
+
+asyncTest('form method is read from "method" and not from "data-method"', 1, function() {
+  buildForm({ method: 'post', 'data-method': 'get' })
+
+  submit(function(e, data, status, xhr) {
+    App.assertPostRequest(data)
+  })
+})
+
+asyncTest('form method is not read from "data-method" attribute in case of missing "method"', 1, function() {
+  buildForm({ 'data-method': 'put' })
+
+  submit(function(e, data, status, xhr) {
+    App.assertGetRequest(data)
+  })
+})
+
+asyncTest('form method is read from submit button "formmethod" if submit is triggered by that button', 1, function() {
+  var submitButton = $('<input type="submit" formmethod="get">')
+  buildForm({ method: 'post' })
+
+  $('#qunit-fixture').find('form').append(submitButton)
+    .bindNative('ajax:success', function(e, data, status, xhr) {
+      App.assertGetRequest(data)
+    })
+    .bindNative('ajax:complete', function() { start() })
+
+  submitButton.triggerNative('click')
+})
+
+asyncTest('form default method is GET', 1, function() {
+  buildForm()
+
+  submit(function(e, data, status, xhr) {
+    App.assertGetRequest(data)
+  })
+})
+
+asyncTest('form url is picked up from "action"', 1, function() {
+  buildForm({ method: 'post' })
+
+  submit(function(e, data, status, xhr) {
+    App.assertRequestPath(data, '/echo')
+  })
+})
+
+asyncTest('form url is read from "action" not "href"', 1, function() {
+  buildForm({ method: 'post', href: '/echo2' })
+
+  submit(function(e, data, status, xhr) {
+    App.assertRequestPath(data, '/echo')
+  })
+})
+
+asyncTest('form url is read from submit button "formaction" if submit is triggered by that button', 1, function() {
+  var submitButton = $('<input type="submit" formaction="/echo">')
+  buildForm({ method: 'post', href: '/echo2' })
+
+  $('#qunit-fixture').find('form').append(submitButton)
+    .bindNative('ajax:success', function(e, data, status, xhr) {
+      App.assertRequestPath(data, '/echo')
+    })
+    .bindNative('ajax:complete', function() { start() })
+
+  submitButton.triggerNative('click')
+})
+
+asyncTest('prefer JS, but accept any format', 1, function() {
+  buildForm({ method: 'post' })
+
+  submit(function(e, data, status, xhr) {
+    var accept = data.HTTP_ACCEPT
+    ok(accept.match(/text\/javascript.+\*\/\*/), 'Accept: ' + accept)
+  })
+})
+
+asyncTest('JS code should be executed', 1, function() {
+  buildForm({ method: 'post', 'data-type': 'script' })
+
+  $('form').append('<input type="text" name="content_type" value="text/javascript">')
+  $('form').append('<input type="text" name="content" value="ok(true, \'remote code should be run\')">')
+
+  submit()
+})
+
+asyncTest('XML document should be parsed', 1, function() {
+  buildForm({ method: 'post', 'data-type': 'html' })
+
+  $('form').append('<input type="text" name="content_type" value="application/xml">')
+  $('form').append('<input type="text" name="content" value="<p>hello</p>">')
+
+  submit(function(e, data, status, xhr) {
+    ok(data instanceof Document, 'returned data should be an XML document')
+  })
+})
+
+asyncTest('accept application/json if "data-type" is json', 1, function() {
+  buildForm({ method: 'post', 'data-type': 'json' })
+
+  submit(function(e, data, status, xhr) {
+    equal(data.HTTP_ACCEPT, 'application/json, text/javascript, */*; q=0.01')
+  })
+})
+
+asyncTest('allow empty "data-remote" attribute', 1, function() {
+  var form = $('#qunit-fixture').append($('<form action="/echo" data-remote />')).find('form')
+
+  submit(function() {
+    ok(true, 'form with empty "data-remote" attribute is also allowed')
+  })
+})
+
+asyncTest('query string in form action should be stripped in a GET request in normal submit', 1, function() {
+  buildForm({ action: '/echo?param1=abc', 'data-remote': 'false' })
+
+  $(document).one('iframe:loaded', function(e, data) {
+    equal(data.params.param1, undefined, '"param1" should not be passed to server')
+    start()
+  })
+
+  $('#qunit-fixture form').triggerNative('submit')
+})
+
+asyncTest('query string in form action should be stripped in a GET request in ajax submit', 1, function() {
+  buildForm({ action: '/echo?param1=abc' })
+
+  submit(function(e, data, status, xhr) {
+    equal(data.params.param1, undefined, '"param1" should not be passed to server')
+  })
+})
+
+asyncTest('query string in form action should not be stripped in a POST request in normal submit', 1, function() {
+  buildForm({ action: '/echo?param1=abc', method: 'post', 'data-remote': 'false' })
+
+  $(document).one('iframe:loaded', function(e, data) {
+    equal(data.params.param1, 'abc', '"param1" should be passed to server')
+    start()
+  })
+
+  $('#qunit-fixture form').triggerNative('submit')
+})
+
+asyncTest('query string in form action should not be stripped in a POST request in ajax submit', 1, function() {
+  buildForm({ action: '/echo?param1=abc', method: 'post' })
+
+  submit(function(e, data, status, xhr) {
+    equal(data.params.param1, 'abc', '"param1" should be passed to server')
+  })
+})
+
+asyncTest('allow empty form "action"', 1, function() {
+  var currentLocation, ajaxLocation
+
+  buildForm({ action: '' })
+
+  $('#qunit-fixture').find('form')
+    .bindNative('ajax:beforeSend', function(e, xhr, settings) {
+      // Get current location (the same way jQuery does)
+      try {
+        currentLocation = location.href
+      } catch(err) {
+        currentLocation = document.createElement( 'a' )
+        currentLocation.href = ''
+        currentLocation = currentLocation.href
+      }
+      currentLocation = currentLocation.replace(/\?.*$/, '')
+
+      // Actual location (strip out settings.data that jQuery serializes and appends)
+      // HACK: can no longer use settings.data below to see what was appended to URL, as of
+      // jQuery 1.6.3 (see http://bugs.jquery.com/ticket/10202 and https://github.com/jquery/jquery/pull/544)
+      ajaxLocation = settings.url.replace('user_name=john', '').replace(/&$/, '').replace(/\?$/, '')
+      equal(ajaxLocation.match(/^(.*)/)[1], currentLocation, 'URL should be current page by default')
+
+      // Prevent the request from actually getting sent to the current page and
+      // causing an error.
+      return false
+    })
+    .triggerNative('submit')
+
+  setTimeout(function() { start() }, 13)
+})
+
+asyncTest('sends CSRF token in custom header', 1, function() {
+  buildForm({ method: 'post' })
+  $('#qunit-fixture').append('<meta name="csrf-token" content="cf50faa3fe97702ca1ae" />')
+
+  submit(function(e, data, status, xhr) {
+    equal(data.HTTP_X_CSRF_TOKEN, 'cf50faa3fe97702ca1ae', 'X-CSRF-Token header should be sent')
+  })
+})
+
+asyncTest('intelligently guesses crossDomain behavior when target URL has a different protocol and/or hostname', 1, function() {
+
+  // Don't set data-cross-domain here, just set action to be a different domain than localhost
+  buildForm({ action: 'http://www.alfajango.com' })
+  $('#qunit-fixture').append('<meta name="csrf-token" content="cf50faa3fe97702ca1ae" />')
+
+  $('#qunit-fixture').find('form')
+    .bindNative('ajax:beforeSend', function(evt, req, settings) {
+
+      equal(settings.crossDomain, true, 'crossDomain should be set to true')
+
+      // prevent request from actually getting sent off-domain
+      return false
+    })
+    .triggerNative('submit')
+
+  setTimeout(function() { start() }, 13)
+})
+
+asyncTest('intelligently guesses crossDomain behavior when target URL consists of only a path', 1, function() {
+
+  // Don't set data-cross-domain here, just set action to be a different domain than localhost
+  buildForm({ action: '/just/a/path' })
+  $('#qunit-fixture').append('<meta name="csrf-token" content="cf50faa3fe97702ca1ae" />')
+
+  $('#qunit-fixture').find('form')
+    .bindNative('ajax:beforeSend', function(evt, req, settings) {
+
+      equal(settings.crossDomain, false, 'crossDomain should be set to false')
+
+      // prevent request from actually getting sent off-domain
+      return false
+    })
+    .triggerNative('submit')
+
+  setTimeout(function() { start() }, 13)
+})
+
+})()
diff --git a/actionview/test/ujs/public/test/csrf-refresh.js b/actionview/test/ujs/public/test/csrf-refresh.js
new file mode 100644
index 0000000000..e302042542
--- /dev/null
+++ b/actionview/test/ujs/public/test/csrf-refresh.js
@@ -0,0 +1,24 @@
+(function() {
+
+module('csrf-refresh', {})
+
+asyncTest('refresh all csrf tokens', 1, function() {
+  var correctToken = 'cf50faa3fe97702ca1ae'
+
+  var form = $('<form />')
+  var input = $('<input>').attr({ type: 'hidden', name: 'authenticity_token', id: 'authenticity_token', value: 'foo' })
+  input.appendTo(form)
+
+  $('#qunit-fixture')
+    .append('<meta name="csrf-param" content="authenticity_token"/>')
+    .append('<meta name="csrf-token" content="' + correctToken + '"/>')
+    .append(form)
+
+  $.rails.refreshCSRFTokens()
+  currentToken = $('#qunit-fixture #authenticity_token').val()
+
+  start()
+  equal(currentToken, correctToken)
+})
+
+})()
diff --git a/actionview/test/ujs/public/test/csrf-token.js b/actionview/test/ujs/public/test/csrf-token.js
new file mode 100644
index 0000000000..388b40e057
--- /dev/null
+++ b/actionview/test/ujs/public/test/csrf-token.js
@@ -0,0 +1,27 @@
+(function() {
+
+module('csrf-token', {})
+
+asyncTest('find csrf token', 1, function() {
+  var correctToken = 'cf50faa3fe97702ca1ae'
+
+  $('#qunit-fixture').append('<meta name="csrf-token" content="' + correctToken + '"/>')
+
+  currentToken = $.rails.csrfToken()
+
+  start()
+  equal(currentToken, correctToken)
+})
+
+asyncTest('find csrf param', 1, function() {
+  var correctParam = 'authenticity_token'
+
+  $('#qunit-fixture').append('<meta name="csrf-param" content="' + correctParam + '"/>')
+
+  currentParam = $.rails.csrfParam()
+
+  start()
+  equal(currentParam, correctParam)
+})
+
+})()
diff --git a/actionview/test/ujs/public/test/data-confirm.js b/actionview/test/ujs/public/test/data-confirm.js
new file mode 100644
index 0000000000..28190c2250
--- /dev/null
+++ b/actionview/test/ujs/public/test/data-confirm.js
@@ -0,0 +1,288 @@
+module('data-confirm', {
+  setup: function() {
+    $('#qunit-fixture').append($('<a />', {
+      href: '/echo',
+      'data-remote': 'true',
+      'data-confirm': 'Are you absolutely sure?',
+      text: 'my social security number'
+    }))
+
+    $('#qunit-fixture').append($('<button />', {
+      'data-url': '/echo',
+      'data-remote': 'true',
+      'data-confirm': 'Are you absolutely sure?',
+      text: 'Click me'
+    }))
+
+    $('#qunit-fixture').append($('<form />', {
+      id: 'confirm',
+      action: '/echo',
+      'data-remote': 'true'
+    }))
+
+    $('#qunit-fixture').append($('<input />', {
+      type: 'submit',
+      form: 'confirm',
+      'data-confirm': 'Are you absolutely sure?'
+    }))
+
+    this.windowConfirm = window.confirm
+  },
+  teardown: function() {
+    window.confirm = this.windowConfirm
+  }
+})
+
+asyncTest('clicking on a link with data-confirm attribute. Confirm yes.', 6, function() {
+  var message
+  // auto-confirm:
+  window.confirm = function(msg) { message = msg; return true }
+
+  $('a[data-confirm]')
+    .bindNative('confirm:complete', function(e, data) {
+      App.assertCallbackInvoked('confirm:complete')
+      ok(data == true, 'confirm:complete passes in confirm answer (true)')
+    })
+    .bindNative('ajax:success', function(e, data, status, xhr) {
+      App.assertCallbackInvoked('ajax:success')
+      App.assertRequestPath(data, '/echo')
+      App.assertGetRequest(data)
+
+      equal(message, 'Are you absolutely sure?')
+      start()
+    })
+    .triggerNative('click')
+})
+
+asyncTest('clicking on a button with data-confirm attribute. Confirm yes.', 6, function() {
+  var message
+  // auto-confirm:
+  window.confirm = function(msg) { message = msg; return true }
+
+  $('button[data-confirm]')
+    .bindNative('confirm:complete', function(e, data) {
+      App.assertCallbackInvoked('confirm:complete')
+      ok(data == true, 'confirm:complete passes in confirm answer (true)')
+    })
+    .bindNative('ajax:success', function(e, data, status, xhr) {
+      App.assertCallbackInvoked('ajax:success')
+      App.assertRequestPath(data, '/echo')
+      App.assertGetRequest(data)
+
+      equal(message, 'Are you absolutely sure?')
+      start()
+    })
+    .triggerNative('click')
+})
+
+asyncTest('clicking on a link with data-confirm attribute. Confirm No.', 3, function() {
+  var message
+  // auto-decline:
+  window.confirm = function(msg) { message = msg; return false }
+
+  $('a[data-confirm]')
+    .bindNative('confirm:complete', function(e, data) {
+      App.assertCallbackInvoked('confirm:complete')
+      ok(data == false, 'confirm:complete passes in confirm answer (false)')
+    })
+    .bindNative('ajax:beforeSend', function(e, data, status, xhr) {
+      App.assertCallbackNotInvoked('ajax:beforeSend')
+    })
+    .triggerNative('click')
+
+  setTimeout(function() {
+    equal(message, 'Are you absolutely sure?')
+    start()
+  }, 50)
+})
+
+asyncTest('clicking on a button with data-confirm attribute. Confirm No.', 3, function() {
+  var message
+  // auto-decline:
+  window.confirm = function(msg) { message = msg; return false }
+
+  $('button[data-confirm]')
+    .bindNative('confirm:complete', function(e, data) {
+      App.assertCallbackInvoked('confirm:complete')
+      ok(data == false, 'confirm:complete passes in confirm answer (false)')
+    })
+    .bindNative('ajax:beforeSend', function(e, data, status, xhr) {
+      App.assertCallbackNotInvoked('ajax:beforeSend')
+    })
+    .triggerNative('click')
+
+  setTimeout(function() {
+    equal(message, 'Are you absolutely sure?')
+    start()
+  }, 50)
+})
+
+asyncTest('clicking on a button with data-confirm attribute. Confirm error.', 3, function() {
+  var message
+  // auto-decline:
+  window.confirm = function(msg) { message = msg; throw 'some random error' }
+
+  $('button[data-confirm]')
+    .bindNative('confirm:complete', function(e, data) {
+      App.assertCallbackInvoked('confirm:complete')
+      ok(data == false, 'confirm:complete passes in confirm answer (false)')
+    })
+    .bindNative('ajax:beforeSend', function(e, data, status, xhr) {
+      App.assertCallbackNotInvoked('ajax:beforeSend')
+    })
+    .triggerNative('click')
+
+  setTimeout(function() {
+    equal(message, 'Are you absolutely sure?')
+    start()
+  }, 50)
+})
+
+asyncTest('clicking on a submit button with form and data-confirm attributes. Confirm No.', 3, function() {
+  var message
+  // auto-decline:
+  window.confirm = function(msg) { message = msg; return false }
+
+  $('input[type=submit][form]')
+    .bindNative('confirm:complete', function(e, data) {
+      App.assertCallbackInvoked('confirm:complete')
+      ok(data == false, 'confirm:complete passes in confirm answer (false)')
+    })
+    .bindNative('ajax:beforeSend', function(e, data, status, xhr) {
+      App.assertCallbackNotInvoked('ajax:beforeSend')
+    })
+    .triggerNative('click')
+
+  setTimeout(function() {
+    equal(message, 'Are you absolutely sure?')
+    start()
+  }, 50)
+})
+
+asyncTest('binding to confirm event of a link and returning false', 1, function() {
+  // redefine confirm function so we can make sure it's not called
+  window.confirm = function(msg) {
+    ok(false, 'confirm dialog should not be called')
+  }
+
+  $('a[data-confirm]')
+    .bindNative('confirm', function() {
+      App.assertCallbackInvoked('confirm')
+      return false
+    })
+    .bindNative('confirm:complete', function() {
+      App.assertCallbackNotInvoked('confirm:complete')
+    })
+    .triggerNative('click')
+
+  setTimeout(function() {
+    start()
+  }, 50)
+})
+
+asyncTest('binding to confirm event of a button and returning false', 1, function() {
+  // redefine confirm function so we can make sure it's not called
+  window.confirm = function(msg) {
+    ok(false, 'confirm dialog should not be called')
+  }
+
+  $('button[data-confirm]')
+    .bindNative('confirm', function() {
+      App.assertCallbackInvoked('confirm')
+      return false
+    })
+    .bindNative('confirm:complete', function() {
+      App.assertCallbackNotInvoked('confirm:complete')
+    })
+    .triggerNative('click')
+
+  setTimeout(function() {
+    start()
+  }, 50)
+})
+
+asyncTest('binding to confirm:complete event of a link and returning false', 2, function() {
+  // auto-confirm:
+  window.confirm = function(msg) {
+    ok(true, 'confirm dialog should be called')
+    return true
+  }
+
+  $('a[data-confirm]')
+    .bindNative('confirm:complete', function() {
+      App.assertCallbackInvoked('confirm:complete')
+      return false
+    })
+    .bindNative('ajax:beforeSend', function() {
+      App.assertCallbackNotInvoked('ajax:beforeSend')
+    })
+    .triggerNative('click')
+
+  setTimeout(function() {
+    start()
+  }, 50)
+})
+
+asyncTest('binding to confirm:complete event of a button and returning false', 2, function() {
+  // auto-confirm:
+  window.confirm = function(msg) {
+    ok(true, 'confirm dialog should be called')
+    return true
+  }
+
+  $('button[data-confirm]')
+    .bindNative('confirm:complete', function() {
+      App.assertCallbackInvoked('confirm:complete')
+      return false
+    })
+    .bindNative('ajax:beforeSend', function() {
+      App.assertCallbackNotInvoked('ajax:beforeSend')
+    })
+    .triggerNative('click')
+
+  setTimeout(function() {
+    start()
+  }, 50)
+})
+
+asyncTest('a button inside a form only confirms once', 1, function() {
+  var confirmations = 0
+  window.confirm = function(msg) {
+    confirmations++
+    return true
+  }
+
+  $('#qunit-fixture').append($('<form />').append($('<button />', {
+    'data-remote': 'true',
+    'data-confirm': 'Are you absolutely sure?',
+    text: 'Click me'
+  })))
+
+  $('form > button[data-confirm]').triggerNative('click')
+
+  ok(confirmations === 1, 'confirmation counter should be 1, but it was ' + confirmations)
+  start()
+})
+
+asyncTest('clicking on the children of a link should also trigger a confirm', 6, function() {
+  var message
+  // auto-confirm:
+  window.confirm = function(msg) { message = msg; return true }
+
+  $('a[data-confirm]')
+    .html('<strong>Click me</strong>')
+    .bindNative('confirm:complete', function(e, data) {
+      App.assertCallbackInvoked('confirm:complete')
+      ok(data == true, 'confirm:complete passes in confirm answer (true)')
+    })
+    .bindNative('ajax:success', function(e, data, status, xhr) {
+      App.assertCallbackInvoked('ajax:success')
+      App.assertRequestPath(data, '/echo')
+      App.assertGetRequest(data)
+
+      equal(message, 'Are you absolutely sure?')
+      start()
+    })
+    .find('strong')
+    .triggerNative('click')
+})
diff --git a/actionview/test/ujs/public/test/data-disable-with.js b/actionview/test/ujs/public/test/data-disable-with.js
new file mode 100644
index 0000000000..b29cbbc867
--- /dev/null
+++ b/actionview/test/ujs/public/test/data-disable-with.js
@@ -0,0 +1,391 @@
+module('data-disable-with', {
+  setup: function() {
+    $('#qunit-fixture').append($('<form />', {
+      action: '/echo',
+      'data-remote': 'true',
+      method: 'post'
+    }))
+      .find('form')
+      .append($('<input type="text" data-disable-with="processing ..." name="user_name" value="john" />'))
+
+    $('#qunit-fixture').append($('<form />', {
+      action: '/echo',
+      method: 'post',
+      id: 'not_remote'
+    }))
+      .find('form:last')
+      // WEEIRDD: the form won't submit to an iframe if the button is name="submit" (??!)
+      .append($('<input type="submit" data-disable-with="submitting ..." name="submit2" value="Submit" />'))
+
+    $('#qunit-fixture').append($('<a />', {
+      text: 'Click me',
+      href: '/echo',
+      'data-disable-with': 'clicking...'
+    }))
+
+    $('#qunit-fixture').append($('<input />', {
+      type: 'submit',
+      form: 'not_remote',
+      'data-disable-with': 'form attr submitting',
+      name: 'submit3',
+      value: 'Form Attr Submit'
+    }))
+
+    $('#qunit-fixture').append($('<button />', {
+      text: 'Click me',
+      'data-remote': true,
+      'data-url': '/echo',
+      'data-disable-with': 'clicking...'
+    }))
+  },
+  teardown: function() {
+    $(document).unbind('iframe:loaded')
+  }
+})
+
+asyncTest('form input field with "data-disable-with" attribute', 7, function() {
+  var form = $('form[data-remote]'), input = form.find('input[type=text]')
+
+  App.checkEnabledState(input, 'john')
+
+  form.bindNative('ajax:success', function(e, data) {
+    setTimeout(function() {
+      App.checkEnabledState(input, 'john')
+      equal(data.params.user_name, 'john')
+      start()
+    }, 13)
+  })
+  form.triggerNative('submit')
+
+  App.checkDisabledState(input, 'processing ...')
+})
+
+asyncTest('blank form input field with "data-disable-with" attribute', 7, function() {
+  var form = $('form[data-remote]'), input = form.find('input[type=text]')
+
+  input.val('')
+  App.checkEnabledState(input, '')
+
+  form.bindNative('ajax:success', function(e, data) {
+    setTimeout(function() {
+      App.checkEnabledState(input, '')
+      equal(data.params.user_name, '')
+      start()
+    }, 13)
+  })
+  form.triggerNative('submit')
+
+  App.checkDisabledState(input, 'processing ...')
+})
+
+asyncTest('form button with "data-disable-with" attribute', 6, function() {
+  var form = $('form[data-remote]'), button = $('<button data-disable-with="submitting ..." name="submit2">Submit</button>')
+  form.append(button)
+
+  App.checkEnabledState(button, 'Submit')
+
+  form.bindNative('ajax:success', function(e, data) {
+    setTimeout(function() {
+      App.checkEnabledState(button, 'Submit')
+      start()
+    }, 13)
+  })
+  form.triggerNative('submit')
+
+  App.checkDisabledState(button, 'submitting ...')
+})
+
+asyncTest('form input[type=submit][data-disable-with] disables', 6, function() {
+  var form = $('form:not([data-remote])'), input = form.find('input[type=submit]')
+
+  App.checkEnabledState(input, 'Submit')
+
+  $(document).bind('iframe:loaded', function(e, data) {
+    setTimeout(function() {
+      App.checkDisabledState(input, 'submitting ...')
+      start()
+    }, 30)
+  })
+  form.triggerNative('submit')
+
+  setTimeout(function() {
+    App.checkDisabledState(input, 'submitting ...')
+  }, 30)
+})
+
+test('form input[type=submit][data-disable-with] re-enables when `pageshow` event is triggered', function() {
+  var form = $('form:not([data-remote])'), input = form.find('input[type=submit]')
+
+  App.checkEnabledState(input, 'Submit')
+
+  // Emulate the disabled state without submitting the form at all, what is the
+  // state after going back on firefox after submitting a form.
+  //
+  // See https://github.com/rails/jquery-ujs/issues/357
+  $.rails.disableElement(form[0])
+
+  App.checkDisabledState(input, 'submitting ...')
+
+  $(window).triggerNative('pageshow')
+
+  App.checkEnabledState(input, 'Submit')
+})
+
+asyncTest('form[data-remote] input[type=submit][data-disable-with] is replaced in ajax callback', 2, function() {
+  var form = $('form:not([data-remote])').attr('data-remote', 'true'), origFormContents = form.html()
+
+  form.bindNative('ajax:success', function() {
+    form.html(origFormContents)
+
+    setTimeout(function() {
+      var input = form.find('input[type=submit]')
+      App.checkEnabledState(input, 'Submit')
+      start()
+    }, 30)
+  }).triggerNative('submit')
+})
+
+asyncTest('form[data-remote] input[data-disable-with] is replaced with disabled field in ajax callback', 2, function() {
+  var form = $('form:not([data-remote])').attr('data-remote', 'true'), input = form.find('input[type=submit]'),
+      newDisabledInput = input.clone().attr('disabled', 'disabled')
+
+  form.bindNative('ajax:success', function() {
+    input.replaceWith(newDisabledInput)
+
+    setTimeout(function() {
+      App.checkEnabledState(newDisabledInput, 'Submit')
+      start()
+    }, 30)
+  }).triggerNative('submit')
+})
+
+asyncTest('form input[type=submit][data-disable-with] using "form" attribute disables', 6, function() {
+  var form = $('#not_remote'), input = $('input[form=not_remote]')
+  App.checkEnabledState(input, 'Form Attr Submit')
+
+  $(document).bind('iframe:loaded', function(e, data) {
+    setTimeout(function() {
+      App.checkDisabledState(input, 'form attr submitting')
+      start()
+    }, 30)
+  })
+  form.triggerNative('submit')
+
+  setTimeout(function() {
+    App.checkDisabledState(input, 'form attr submitting')
+  }, 30)
+
+})
+
+asyncTest('form[data-remote] textarea[data-disable-with] attribute', 3, function() {
+  var form = $('form[data-remote]'),
+      textarea = $('<textarea data-disable-with="processing ..." name="user_bio">born, lived, died.</textarea>').appendTo(form)
+
+  form.bindNative('ajax:success', function(e, data) {
+    setTimeout(function() {
+      equal(data.params.user_bio, 'born, lived, died.')
+      start()
+    }, 13)
+  })
+  form.triggerNative('submit')
+
+  App.checkDisabledState(textarea, 'processing ...')
+})
+
+asyncTest('a[data-disable-with] disables', 4, function() {
+  var link = $('a[data-disable-with]')
+
+  App.checkEnabledState(link, 'Click me')
+
+  link.triggerNative('click')
+  App.checkDisabledState(link, 'clicking...')
+  start()
+})
+
+test('a[data-disable-with] re-enables when `pageshow` event is triggered', function() {
+  var link = $('a[data-disable-with]')
+
+  App.checkEnabledState(link, 'Click me')
+
+  link.triggerNative('click')
+  App.checkDisabledState(link, 'clicking...')
+
+  $(window).triggerNative('pageshow')
+  App.checkEnabledState(link, 'Click me')
+})
+
+asyncTest('a[data-remote][data-disable-with] disables and re-enables', 6, function() {
+  var link = $('a[data-disable-with]').attr('data-remote', true)
+
+  App.checkEnabledState(link, 'Click me')
+
+  link
+    .bindNative('ajax:beforeSend', function() {
+      App.checkDisabledState(link, 'clicking...')
+    })
+    .bindNative('ajax:complete', function() {
+      setTimeout( function() {
+        App.checkEnabledState(link, 'Click me')
+        start()
+      }, 15)
+    })
+    .triggerNative('click')
+})
+
+asyncTest('a[data-remote][data-disable-with] re-enables when `ajax:before` event is cancelled', 6, function() {
+  var link = $('a[data-disable-with]').attr('data-remote', true)
+
+  App.checkEnabledState(link, 'Click me')
+
+  link
+    .bindNative('ajax:before', function() {
+      App.checkDisabledState(link, 'clicking...')
+      return false
+    })
+    .triggerNative('click')
+
+  setTimeout(function() {
+    App.checkEnabledState(link, 'Click me')
+    start()
+  }, 30)
+})
+
+asyncTest('a[data-remote][data-disable-with] re-enables when `ajax:beforeSend` event is cancelled', 6, function() {
+  var link = $('a[data-disable-with]').attr('data-remote', true)
+
+  App.checkEnabledState(link, 'Click me')
+
+  link
+    .bindNative('ajax:beforeSend', function() {
+      App.checkDisabledState(link, 'clicking...')
+      return false
+    })
+    .triggerNative('click')
+
+  setTimeout(function() {
+    App.checkEnabledState(link, 'Click me')
+    start()
+  }, 30)
+})
+
+asyncTest('a[data-remote][data-disable-with] re-enables when `ajax:error` event is triggered', 6, function() {
+  var link = $('a[data-disable-with]').attr('data-remote', true).attr('href', '/error')
+
+  App.checkEnabledState(link, 'Click me')
+
+  link
+    .bindNative('ajax:beforeSend', function() {
+      App.checkDisabledState(link, 'clicking...')
+    })
+    .triggerNative('click')
+
+  setTimeout(function() {
+    App.checkEnabledState(link, 'Click me')
+    start()
+  }, 30)
+})
+
+asyncTest('form[data-remote] input|button|textarea[data-disable-with] does not disable when `ajax:beforeSend` event is cancelled', 8, function() {
+  var form = $('form[data-remote]'),
+      input = form.find('input:text'),
+      button = $('<button data-disable-with="submitting ..." name="submit2">Submit</button>').appendTo(form),
+      textarea = $('<textarea data-disable-with="processing ..." name="user_bio">born, lived, died.</textarea>').appendTo(form),
+      submit = $('<input type="submit" data-disable-with="submitting ..." name="submit2" value="Submit" />').appendTo(form)
+
+  form
+    .bindNative('ajax:beforeSend', function() {
+      return false
+    })
+    .triggerNative('submit')
+
+  App.checkEnabledState(input, 'john')
+  App.checkEnabledState(button, 'Submit')
+  App.checkEnabledState(textarea, 'born, lived, died.')
+  App.checkEnabledState(submit, 'Submit')
+
+  start()
+})
+
+asyncTest('ctrl-clicking on a link does not disables the link', 6, function() {
+  var link = $('a[data-disable-with]')
+
+  App.checkEnabledState(link, 'Click me')
+
+  link.triggerNative('click', { metaKey: true })
+  App.checkEnabledState(link, 'Click me')
+
+  link.triggerNative('click', { metaKey: true })
+  App.checkEnabledState(link, 'Click me')
+  start()
+})
+
+asyncTest('button[data-remote][data-disable-with] disables and re-enables', 6, function() {
+  var button = $('button[data-remote][data-disable-with]')
+
+  App.checkEnabledState(button, 'Click me')
+
+  button
+    .bindNative('ajax:send', function() {
+      App.checkDisabledState(button, 'clicking...')
+    })
+    .bindNative('ajax:complete', function() {
+      setTimeout( function() {
+        App.checkEnabledState(button, 'Click me')
+        start()
+      }, 15)
+    })
+    .triggerNative('click')
+})
+
+asyncTest('button[data-remote][data-disable-with] re-enables when `ajax:before` event is cancelled', 6, function() {
+  var button = $('button[data-remote][data-disable-with]')
+
+  App.checkEnabledState(button, 'Click me')
+
+  button
+    .bindNative('ajax:before', function() {
+      App.checkDisabledState(button, 'clicking...')
+      return false
+    })
+    .triggerNative('click')
+
+  setTimeout(function() {
+    App.checkEnabledState(button, 'Click me')
+    start()
+  }, 30)
+})
+
+asyncTest('button[data-remote][data-disable-with] re-enables when `ajax:beforeSend` event is cancelled', 6, function() {
+  var button = $('button[data-remote][data-disable-with]')
+
+  App.checkEnabledState(button, 'Click me')
+
+  button
+    .bindNative('ajax:beforeSend', function() {
+      App.checkDisabledState(button, 'clicking...')
+      return false
+    })
+    .triggerNative('click')
+
+  setTimeout(function() {
+    App.checkEnabledState(button, 'Click me')
+    start()
+  }, 30)
+})
+
+asyncTest('button[data-remote][data-disable-with] re-enables when `ajax:error` event is triggered', 6, function() {
+  var button = $('a[data-disable-with]').attr('data-remote', true).attr('href', '/error')
+
+  App.checkEnabledState(button, 'Click me')
+
+  button
+    .bindNative('ajax:send', function() {
+      App.checkDisabledState(button, 'clicking...')
+    })
+    .triggerNative('click')
+
+  setTimeout(function() {
+    App.checkEnabledState(button, 'Click me')
+    start()
+  }, 30)
+})
diff --git a/actionview/test/ujs/public/test/data-disable.js b/actionview/test/ujs/public/test/data-disable.js
new file mode 100644
index 0000000000..ccc38cf9ae
--- /dev/null
+++ b/actionview/test/ujs/public/test/data-disable.js
@@ -0,0 +1,321 @@
+module('data-disable', {
+  setup: function() {
+    $('#qunit-fixture').append($('<form />', {
+      action: '/echo',
+      'data-remote': 'true',
+      method: 'post'
+    }))
+      .find('form')
+      .append($('<input type="text" data-disable name="user_name" value="john" />'))
+
+    $('#qunit-fixture').append($('<form />', {
+      action: '/echo',
+      method: 'post'
+    }))
+      .find('form:last')
+      // WEEIRDD: the form won't submit to an iframe if the button is name="submit" (??!)
+      .append($('<input type="submit" data-disable name="submit2" value="Submit" />'))
+
+    $('#qunit-fixture').append($('<a />', {
+      text: 'Click me',
+      href: '/echo',
+      'data-disable': 'true'
+    }))
+
+    $('#qunit-fixture').append($('<button />', {
+      text: 'Click me',
+      'data-remote': true,
+      'data-url': '/echo',
+      'data-disable': 'true'
+    }))
+  },
+  teardown: function() {
+    $(document).unbind('iframe:loaded')
+  }
+})
+
+asyncTest('form input field with "data-disable" attribute', 7, function() {
+  var form = $('form[data-remote]'), input = form.find('input[type=text]')
+
+  App.checkEnabledState(input, 'john')
+
+  form.bindNative('ajax:success', function(e, data) {
+    setTimeout(function() {
+      App.checkEnabledState(input, 'john')
+      equal(data.params.user_name, 'john')
+      start()
+    }, 13)
+  })
+  form.triggerNative('submit')
+
+  App.checkDisabledState(input, 'john')
+})
+
+asyncTest('form button with "data-disable" attribute', 7, function() {
+  var form = $('form[data-remote]'), button = $('<button data-disable name="submit2">Submit</button>')
+  form.append(button)
+
+  App.checkEnabledState(button, 'Submit')
+
+  form.bindNative('ajax:success', function(e, data) {
+    setTimeout(function() {
+      App.checkEnabledState(button, 'Submit')
+      start()
+    }, 13)
+  })
+  form.triggerNative('submit')
+
+  App.checkDisabledState(button, 'Submit')
+  equal(button.data('ujs:enable-with'), undefined)
+})
+
+asyncTest('form input[type=submit][data-disable] disables', 6, function() {
+  var form = $('form:not([data-remote])'), input = form.find('input[type=submit]')
+
+  App.checkEnabledState(input, 'Submit')
+
+  // WEEIRDD: attaching this handler makes the test work in IE7
+  $(document).bind('iframe:loading', function(e, f) {})
+
+  $(document).bind('iframe:loaded', function(e, data) {
+    setTimeout(function() {
+      App.checkDisabledState(input, 'Submit')
+      start()
+    }, 30)
+  })
+  form.triggerNative('submit')
+
+  setTimeout(function() {
+    App.checkDisabledState(input, 'Submit')
+  }, 30)
+})
+
+asyncTest('form[data-remote] input[type=submit][data-disable] is replaced in ajax callback', 2, function() {
+  var form = $('form:not([data-remote])').attr('data-remote', 'true'), origFormContents = form.html()
+
+  form.bindNative('ajax:success', function() {
+    form.html(origFormContents)
+
+    setTimeout(function() {
+      var input = form.find('input[type=submit]')
+      App.checkEnabledState(input, 'Submit')
+      start()
+    }, 30)
+  }).triggerNative('submit')
+})
+
+asyncTest('form[data-remote] input[data-disable] is replaced with disabled field in ajax callback', 2, function() {
+  var form = $('form:not([data-remote])').attr('data-remote', 'true'), input = form.find('input[type=submit]'),
+      newDisabledInput = input.clone().attr('disabled', 'disabled')
+
+  form.bindNative('ajax:success', function() {
+    input.replaceWith(newDisabledInput)
+
+    setTimeout(function() {
+      App.checkEnabledState(newDisabledInput, 'Submit')
+      start()
+    }, 30)
+  }).triggerNative('submit')
+})
+
+asyncTest('form[data-remote] textarea[data-disable] attribute', 3, function() {
+  var form = $('form[data-remote]'),
+      textarea = $('<textarea data-disable name="user_bio">born, lived, died.</textarea>').appendTo(form)
+
+  form.bindNative('ajax:success', function(e, data) {
+    setTimeout(function() {
+      equal(data.params.user_bio, 'born, lived, died.')
+      start()
+    }, 13)
+  })
+  form.triggerNative('submit')
+
+  App.checkDisabledState(textarea, 'born, lived, died.')
+})
+
+asyncTest('a[data-disable] disables', 5, function() {
+  var link = $('a[data-disable]')
+
+  App.checkEnabledState(link, 'Click me')
+
+  link.triggerNative('click')
+  App.checkDisabledState(link, 'Click me')
+  equal(link.data('ujs:enable-with'), undefined)
+  start()
+})
+
+asyncTest('a[data-remote][data-disable] disables and re-enables', 6, function() {
+  var link = $('a[data-disable]').attr('data-remote', true)
+
+  App.checkEnabledState(link, 'Click me')
+
+  link
+    .bindNative('ajax:send', function() {
+      App.checkDisabledState(link, 'Click me')
+    })
+    .bindNative('ajax:complete', function() {
+      setTimeout( function() {
+        App.checkEnabledState(link, 'Click me')
+        start()
+      }, 15)
+    })
+    .triggerNative('click')
+})
+
+asyncTest('a[data-remote][data-disable] re-enables when `ajax:before` event is cancelled', 6, function() {
+  var link = $('a[data-disable]').attr('data-remote', true)
+
+  App.checkEnabledState(link, 'Click me')
+
+  link
+    .bindNative('ajax:before', function() {
+      App.checkDisabledState(link, 'Click me')
+      return false
+    })
+    .triggerNative('click')
+
+  setTimeout(function() {
+    App.checkEnabledState(link, 'Click me')
+    start()
+  }, 30)
+})
+
+asyncTest('a[data-remote][data-disable] re-enables when `ajax:beforeSend` event is cancelled', 6, function() {
+  var link = $('a[data-disable]').attr('data-remote', true)
+
+  App.checkEnabledState(link, 'Click me')
+
+  link
+    .bindNative('ajax:beforeSend', function() {
+      App.checkDisabledState(link, 'Click me')
+      return false
+    })
+    .triggerNative('click')
+
+  setTimeout(function() {
+    App.checkEnabledState(link, 'Click me')
+    start()
+  }, 30)
+})
+
+asyncTest('a[data-remote][data-disable] re-enables when `ajax:error` event is triggered', 6, function() {
+  var link = $('a[data-disable]').attr('data-remote', true).attr('href', '/error')
+
+  App.checkEnabledState(link, 'Click me')
+
+  link
+    .bindNative('ajax:send', function() {
+      App.checkDisabledState(link, 'Click me')
+    })
+    .triggerNative('click')
+
+  setTimeout(function() {
+    App.checkEnabledState(link, 'Click me')
+    start()
+  }, 30)
+})
+
+asyncTest('form[data-remote] input|button|textarea[data-disable] does not disable when `ajax:beforeSend` event is cancelled', 8, function() {
+  var form = $('form[data-remote]'),
+      input = form.find('input:text'),
+      button = $('<button data-disable="submitting ..." name="submit2">Submit</button>').appendTo(form),
+      textarea = $('<textarea data-disable name="user_bio">born, lived, died.</textarea>').appendTo(form),
+      submit = $('<input type="submit" data-disable="submitting ..." name="submit2" value="Submit" />').appendTo(form)
+
+  form
+    .bindNative('ajax:beforeSend', function() {
+      return false
+    })
+    .triggerNative('submit')
+
+  App.checkEnabledState(input, 'john')
+  App.checkEnabledState(button, 'Submit')
+  App.checkEnabledState(textarea, 'born, lived, died.')
+  App.checkEnabledState(submit, 'Submit')
+
+  start()
+})
+
+asyncTest('ctrl-clicking on a link does not disables the link', 6, function() {
+  var link = $('a[data-disable]')
+
+  App.checkEnabledState(link, 'Click me')
+
+  link.triggerNative('click', { metaKey: true })
+  App.checkEnabledState(link, 'Click me')
+
+  link.triggerNative('click', { ctrlKey: true })
+  App.checkEnabledState(link, 'Click me')
+  start()
+})
+
+asyncTest('button[data-remote][data-disable] disables and re-enables', 6, function() {
+  var button = $('button[data-remote][data-disable]')
+
+  App.checkEnabledState(button, 'Click me')
+
+  button
+    .bindNative('ajax:send', function() {
+      App.checkDisabledState(button, 'Click me')
+    })
+    .bindNative('ajax:complete', function() {
+      setTimeout( function() {
+        App.checkEnabledState(button, 'Click me')
+        start()
+      }, 15)
+    })
+    .triggerNative('click')
+})
+
+asyncTest('button[data-remote][data-disable] re-enables when `ajax:before` event is cancelled', 6, function() {
+  var button = $('button[data-remote][data-disable]')
+
+  App.checkEnabledState(button, 'Click me')
+
+  button
+    .bindNative('ajax:before', function() {
+      App.checkDisabledState(button, 'Click me')
+      return false
+    })
+    .triggerNative('click')
+
+  setTimeout(function() {
+    App.checkEnabledState(button, 'Click me')
+    start()
+  }, 30)
+})
+
+asyncTest('button[data-remote][data-disable] re-enables when `ajax:beforeSend` event is cancelled', 6, function() {
+  var button = $('button[data-remote][data-disable]')
+
+  App.checkEnabledState(button, 'Click me')
+
+  button
+    .bindNative('ajax:beforeSend', function() {
+      App.checkDisabledState(button, 'Click me')
+      return false
+    })
+    .triggerNative('click')
+
+  setTimeout(function() {
+    App.checkEnabledState(button, 'Click me')
+    start()
+  }, 30)
+})
+
+asyncTest('button[data-remote][data-disable] re-enables when `ajax:error` event is triggered', 6, function() {
+  var button = $('a[data-disable]').attr('data-remote', true).attr('href', '/error')
+
+  App.checkEnabledState(button, 'Click me')
+
+  button
+    .bindNative('ajax:send', function() {
+      App.checkDisabledState(button, 'Click me')
+    })
+    .triggerNative('click')
+
+  setTimeout(function() {
+    App.checkEnabledState(button, 'Click me')
+    start()
+  }, 30)
+})
diff --git a/actionview/test/ujs/public/test/data-method.js b/actionview/test/ujs/public/test/data-method.js
new file mode 100644
index 0000000000..47d940c577
--- /dev/null
+++ b/actionview/test/ujs/public/test/data-method.js
@@ -0,0 +1,85 @@
+(function() {
+
+module('data-method', {
+  setup: function() {
+    $('#qunit-fixture').append($('<a />', {
+      href: '/echo', 'data-method': 'delete', text: 'destroy!'
+    }))
+  },
+  teardown: function() {
+    $(document).unbind('iframe:loaded')
+  }
+})
+
+function submit(fn, options) {
+  $(document).bind('iframe:loaded', function(e, data) {
+    fn(data)
+    start()
+  })
+
+  $('#qunit-fixture').find('a')
+    .triggerNative('click')
+}
+
+asyncTest('link with "data-method" set to "delete"', 3, function() {
+  submit(function(data) {
+    equal(data.REQUEST_METHOD, 'DELETE')
+    strictEqual(data.params.authenticity_token, undefined)
+    strictEqual(data.HTTP_X_CSRF_TOKEN, undefined)
+  })
+})
+
+asyncTest('click on the child of link with "data-method"', 3, function() {
+  $(document).bind('iframe:loaded', function(e, data) {
+    equal(data.REQUEST_METHOD, 'DELETE')
+    strictEqual(data.params.authenticity_token, undefined)
+    strictEqual(data.HTTP_X_CSRF_TOKEN, undefined)
+    start()
+  })
+  $('#qunit-fixture a').html('<strong>destroy!</strong>').find('strong').triggerNative('click')
+})
+
+asyncTest('link with "data-method" and CSRF', 1, function() {
+  $('#qunit-fixture')
+    .append('<meta name="csrf-param" content="authenticity_token"/>')
+    .append('<meta name="csrf-token" content="cf50faa3fe97702ca1ae"/>')
+
+  submit(function(data) {
+    equal(data.params.authenticity_token, 'cf50faa3fe97702ca1ae')
+  })
+})
+
+asyncTest('link "target" should be carried over to generated form', 1, function() {
+  $('a[data-method]').attr('target', 'super-special-frame')
+  submit(function(data) {
+    equal(data.params._target, 'super-special-frame')
+  })
+})
+
+asyncTest('link with "data-method" and cross origin', 1, function() {
+  var data = {}
+
+  $('#qunit-fixture')
+    .append('<meta name="csrf-param" content="authenticity_token"/>')
+    .append('<meta name="csrf-token" content="cf50faa3fe97702ca1ae"/>')
+
+  $(document).on('submit', 'form', function(e) {
+    $(e.currentTarget).serializeArray().map(function(item) {
+      data[item.name] = item.value
+    })
+
+    return false
+  })
+
+  var link = $('#qunit-fixture').find('a')
+
+  link.attr('href', 'http://www.alfajango.com')
+
+  link.triggerNative('click')
+
+  start()
+
+  notEqual(data.authenticity_token, 'cf50faa3fe97702ca1ae')
+})
+
+})()
diff --git a/actionview/test/ujs/public/test/data-remote.js b/actionview/test/ujs/public/test/data-remote.js
new file mode 100644
index 0000000000..a51aa10417
--- /dev/null
+++ b/actionview/test/ujs/public/test/data-remote.js
@@ -0,0 +1,400 @@
+module('data-remote', {
+  setup: function() {
+    $('#qunit-fixture')
+      .append($('<a />', {
+        href: '/echo',
+        'data-remote': 'true',
+        'data-params': 'data1=value1&data2=value2',
+        text: 'my address'
+      }))
+      .append($('<button />', {
+        'data-url': '/echo',
+        'data-remote': 'true',
+        'data-params': 'data1=value1&data2=value2',
+        text: 'my button'
+      }))
+      .append($('<form />', {
+        action: '/echo',
+        'data-remote': 'true',
+        method: 'post',
+        id: 'my-remote-form'
+      }))
+      .append($('<a />', {
+        href: '/echo',
+        'data-remote': 'true',
+        disabled: 'disabled',
+        text: 'Disabed link'
+      }))
+      .find('form').append($('<input type="text" name="user_name" value="john">'))
+
+  }
+})
+
+asyncTest('ctrl-clicking on a link does not fire ajaxyness', 0, function() {
+  var link = $('a[data-remote]')
+
+  // Ideally, we'd setup an iframe to intercept normal link clicks
+  // and add a test to make sure the iframe:loaded event is triggered.
+  // However, jquery doesn't actually cause a native `click` event and
+  // follow links using `trigger('click')`, it only fires bindings.
+  link
+    .removeAttr('data-params')
+    .bindNative('ajax:beforeSend', function() {
+      ok(false, 'ajax should not be triggered')
+    })
+
+  link.triggerNative('click', { metaKey: true })
+  link.triggerNative('click', { ctrlKey: true })
+
+  setTimeout(function() { start() }, 13)
+})
+
+asyncTest('ctrl-clicking on a link still fires ajax for non-GET links and for links with "data-params"', 2, function() {
+  var link = $('a[data-remote]')
+
+  link
+    .removeAttr('data-params')
+    .attr('data-method', 'POST')
+    .bindNative('ajax:beforeSend', function() {
+      ok(true, 'ajax should be triggered')
+    })
+    .triggerNative('click', { metaKey: true })
+
+  link
+    .removeAttr('data-method')
+    .attr('data-params', 'name=steve')
+    .triggerNative('click', { metaKey: true })
+
+  setTimeout(function() { start() }, 13)
+})
+
+asyncTest('clicking on a link with data-remote attribute', 5, function() {
+  $('a[data-remote]')
+    .bindNative('ajax:success', function(e, data, status, xhr) {
+      App.assertCallbackInvoked('ajax:success')
+      App.assertRequestPath(data, '/echo')
+      console.log(data.params)
+      equal(data.params.data1, 'value1', 'ajax arguments should have key data1 with right value')
+      equal(data.params.data2, 'value2', 'ajax arguments should have key data2 with right value')
+      App.assertGetRequest(data)
+    })
+    .bindNative('ajax:complete', function() { start() })
+    .triggerNative('click')
+})
+
+asyncTest('clicking on a link with both query string in href and data-params', 4, function() {
+  $('a[data-remote]')
+    .attr('href', '/echo?data3=value3')
+    .bindNative('ajax:success', function(e, data, status, xhr) {
+      App.assertGetRequest(data)
+      equal(data.params.data1, 'value1', 'ajax arguments should have key data1 with right value')
+      equal(data.params.data2, 'value2', 'ajax arguments should have key data2 with right value')
+      equal(data.params.data3, 'value3', 'query string in url should be passed to server with right value')
+    })
+    .bindNative('ajax:complete', function() { start() })
+    .triggerNative('click')
+})
+
+asyncTest('clicking on a link with both query string in href and data-params with POST method', 4, function() {
+  $('a[data-remote]')
+    .attr('href', '/echo?data3=value3')
+    .attr('data-method', 'post')
+    .bindNative('ajax:success', function(e, data, status, xhr) {
+      App.assertPostRequest(data)
+      equal(data.params.data1, 'value1', 'ajax arguments should have key data1 with right value')
+      equal(data.params.data2, 'value2', 'ajax arguments should have key data2 with right value')
+      equal(data.params.data3, 'value3', 'query string in url should be passed to server with right value')
+    })
+    .bindNative('ajax:complete', function() { start() })
+    .triggerNative('click')
+})
+
+asyncTest('clicking on a link with disabled attribute', 0, function() {
+  $('a[disabled]')
+  .bindNative('ajax:before', function(e, data, status, xhr) {
+    App.assertCallbackNotInvoked('ajax:success')
+  })
+  .bindNative('ajax:complete', function() { start() })
+  .triggerNative('click')
+
+  setTimeout(function() {
+    start()
+  }, 13)
+})
+
+asyncTest('clicking on a button with data-remote attribute', 5, function() {
+  $('button[data-remote]')
+    .bindNative('ajax:success', function(e, data, status, xhr) {
+      App.assertCallbackInvoked('ajax:success')
+      App.assertRequestPath(data, '/echo')
+      equal(data.params.data1, 'value1', 'ajax arguments should have key data1 with right value')
+      equal(data.params.data2, 'value2', 'ajax arguments should have key data2 with right value')
+      App.assertGetRequest(data)
+    })
+    .bindNative('ajax:complete', function() { start() })
+    .triggerNative('click')
+})
+
+asyncTest('changing a select option with data-remote attribute', 5, function() {
+  $('form')
+    .append(
+      $('<select />', {
+        'name': 'user_data',
+        'data-remote': 'true',
+        'data-params': 'data1=value1',
+        'data-url': '/echo'
+      })
+      .append($('<option />', {value: 'optionValue1', text: 'option1'}))
+      .append($('<option />', {value: 'optionValue2', text: 'option2'}))
+    )
+
+  $('select[data-remote]')
+    .bindNative('ajax:success', function(e, data, status, xhr) {
+      App.assertCallbackInvoked('ajax:success')
+      App.assertRequestPath(data, '/echo')
+      equal(data.params.user_data, 'optionValue2', 'ajax arguments should have key term with right value')
+      equal(data.params.data1, 'value1', 'ajax arguments should have key data1 with right value')
+      App.assertGetRequest(data)
+    })
+    .bindNative('ajax:complete', function() { start() })
+    .val('optionValue2')
+    .triggerNative('change')
+})
+
+asyncTest('submitting form with data-remote attribute', 4, function() {
+  $('form[data-remote]')
+    .bindNative('ajax:success', function(e, data, status, xhr) {
+      App.assertCallbackInvoked('ajax:success')
+      App.assertRequestPath(data, '/echo')
+      equal(data.params.user_name, 'john', 'ajax arguments should have key user_name with right value')
+      App.assertPostRequest(data)
+    })
+    .bindNative('ajax:complete', function() { start() })
+    .triggerNative('submit')
+})
+
+asyncTest('submitting form with data-remote attribute should include inputs in a fieldset only once', 3, function() {
+  $('form[data-remote]')
+    .append('<fieldset><input name="items[]" value="Item" /></fieldset>')
+    .bindNative('ajax:success', function(e, data, status, xhr) {
+      App.assertCallbackInvoked('ajax:success')
+      equal(data.params.items.length, 1, 'ajax arguments should only have the item once')
+      App.assertPostRequest(data)
+    })
+    .bindNative('ajax:complete', function() {
+      $('form[data-remote], fieldset').remove()
+      start()
+    })
+    .triggerNative('submit')
+})
+
+asyncTest('submitting form with data-remote attribute submits input with matching [form] attribute', 5, function() {
+  $('#qunit-fixture')
+    .append($('<input type="text" name="user_data" value="value1" form="my-remote-form">'))
+
+  $('form[data-remote]')
+    .bindNative('ajax:success', function(e, data, status, xhr) {
+      App.assertCallbackInvoked('ajax:success')
+      App.assertRequestPath(data, '/echo')
+      equal(data.params.user_name, 'john', 'ajax arguments should have key user_name with right value')
+      equal(data.params.user_data, 'value1', 'ajax arguments should have key user_data with right value')
+      App.assertPostRequest(data)
+    })
+    .bindNative('ajax:complete', function() { start() })
+    .triggerNative('submit')
+})
+
+asyncTest('submitting form with data-remote attribute by clicking button with matching [form] attribute', 5, function() {
+  $('form[data-remote]')
+    .bindNative('ajax:success', function(e, data, status, xhr) {
+      App.assertCallbackInvoked('ajax:success')
+      App.assertRequestPath(data, '/echo')
+      equal(data.params.user_name, 'john', 'ajax arguments should have key user_name with right value')
+      equal(data.params.user_data, 'value2', 'ajax arguments should have key user_data with right value')
+      App.assertPostRequest(data)
+    })
+    .bindNative('ajax:complete', function() { start() })
+
+  $('<button />', {
+        type: 'submit',
+        name: 'user_data',
+        value: 'value1',
+        form: 'my-remote-form'
+      })
+    .appendTo($('#qunit-fixture'))
+
+  $('<button />', {
+      type: 'submit',
+      name: 'user_data',
+      value: 'value2',
+      form: 'my-remote-form'
+    })
+    .appendTo($('#qunit-fixture'))
+    .triggerNative('click')
+})
+
+asyncTest('form\'s submit bindings in browsers that don\'t support submit bubbling', 5, function() {
+  var form = $('form[data-remote]'), directBindingCalled = false
+
+  ok(!directBindingCalled, 'nothing is called')
+
+  form
+    .append($('<input type="submit" />'))
+    .bindNative('submit', function(event) {
+      ok(event.type == 'submit', 'submit event handlers are called with submit event')
+      ok(true, 'binding handler is called')
+      directBindingCalled = true
+    })
+    .bindNative('ajax:beforeSend', function() {
+      ok(true, 'form being submitted via ajax')
+      ok(directBindingCalled, 'binding handler already called')
+    })
+    .bindNative('ajax:complete', function() {
+      start()
+    })
+
+    if(!$.support.submitBubbles) {
+      // Must indrectly submit form via click to trigger jQuery's manual submit bubbling in IE
+      form.find('input[type=submit]')
+      .triggerNative('click')
+    } else {
+      form.triggerNative('submit')
+    }
+})
+
+asyncTest('returning false in form\'s submit bindings in non-submit-bubbling browsers', 1, function() {
+  var form = $('form[data-remote]')
+
+  form
+    .append($('<input type="submit" />'))
+    .bindNative('submit', function() {
+      ok(true, 'binding handler is called')
+      return false
+    })
+    .bindNative('ajax:beforeSend', function() {
+      ok(false, 'form should not be submitted')
+    })
+
+    if (!$.support.submitBubbles) {
+      // Must indrectly submit form via click to trigger jQuery's manual submit bubbling in IE
+      form.find('input[type=submit]').triggerNative('click')
+    } else {
+      form.triggerNative('submit')
+    }
+
+    setTimeout(function() { start() }, 13)
+})
+
+asyncTest('clicking on a link with falsy "data-remote" attribute does not fire ajaxyness', 0, function() {
+  $('a[data-remote]')
+    .attr('data-remote', 'false')
+    .bindNative('ajax:beforeSend', function() {
+      ok(false, 'ajax should not be triggered')
+    })
+    .bindNative('click', function() {
+      return false
+    })
+    .triggerNative('click')
+
+  setTimeout(function() { start() }, 20)
+})
+
+asyncTest('ctrl-clicking on a link with falsy "data-remote" attribute does not fire ajaxyness even if "data-params" present', 0, function() {
+  var link = $('a[data-remote]')
+
+  link
+    .removeAttr('data-params')
+    .attr('data-remote', 'false')
+    .attr('data-method', 'POST')
+    .bindNative('ajax:beforeSend', function() {
+      ok(false, 'ajax should not be triggered')
+    })
+    .bindNative('click', function() {
+      return false
+    })
+    .triggerNative('click', { metaKey: true })
+
+  link
+    .removeAttr('data-method')
+    .attr('data-params', 'name=steve')
+    .triggerNative('click', { metaKey: true })
+
+  setTimeout(function() { start() }, 20)
+})
+
+asyncTest('clicking on a button with falsy "data-remote" attribute', 0, function() {
+  $('button[data-remote]:first')
+    .attr('data-remote', 'false')
+    .bindNative('ajax:beforeSend', function() {
+      ok(false, 'ajax should not be triggered')
+    })
+    .bindNative('click', function() {
+      return false
+    })
+    .triggerNative('click')
+
+  setTimeout(function() { start() }, 20)
+})
+
+asyncTest('submitting a form with falsy "data-remote" attribute', 0, function() {
+  $('form[data-remote]:first')
+    .attr('data-remote', 'false')
+    .bindNative('ajax:beforeSend', function() {
+      ok(false, 'ajax should not be triggered')
+    })
+    .bindNative('submit', function() {
+      return false
+    })
+    .triggerNative('submit')
+
+  setTimeout(function() { start() }, 20)
+})
+
+asyncTest('changing a select option with falsy "data-remote" attribute', 0, function() {
+  $('form')
+    .append(
+      $('<select />', {
+        'name': 'user_data',
+        'data-remote': 'false',
+        'data-params': 'data1=value1',
+        'data-url': '/echo'
+      })
+      .append($('<option />', {value: 'optionValue1', text: 'option1'}))
+      .append($('<option />', {value: 'optionValue2', text: 'option2'}))
+    )
+
+  $('select[data-remote=false]:first')
+    .bindNative('ajax:beforeSend', function() {
+      ok(false, 'ajax should not be triggered')
+    })
+    .val('optionValue2')
+    .triggerNative('change')
+
+  setTimeout(function() { start() }, 20)
+})
+
+asyncTest('form should be serialized correctly', 6, function() {
+  $('form')
+    .append('<textarea name="textarea">textarea</textarea>')
+    .append('<input type="checkbox" name="checkbox[]" value="0" />')
+    .append('<input type="checkbox" checked="checked" name="checkbox[]" value="1" />')
+    .append('<input type="radio" checked="checked" name="radio" value="0" />')
+    .append('<input type="radio" name="radio" value="1" />')
+    .append('<select multiple="multiple" name="select[]">\
+      <option value="1" selected>1</option>\
+      <option value="2" selected>2</option>\
+      <option value="3">3</option>\
+      <option selected>4</option>\
+    </select>')
+    .bindNative('ajax:success', function(e, data, status, xhr) {
+      equal(data.params.checkbox.length, 1)
+      equal(data.params.checkbox[0], '1')
+      equal(data.params.radio, '0')
+      equal(data.params.select.length, 3)
+      equal(data.params.select[2], '4')
+      equal(data.params.textarea, 'textarea')
+
+      start()
+    })
+    .triggerNative('submit')
+})
diff --git a/actionview/test/ujs/public/test/override.js b/actionview/test/ujs/public/test/override.js
new file mode 100644
index 0000000000..be6ec7749b
--- /dev/null
+++ b/actionview/test/ujs/public/test/override.js
@@ -0,0 +1,56 @@
+(function() {
+
+var realHref
+
+module('override', {
+  setup: function() {
+    realHref = $.rails.href
+    $('#qunit-fixture')
+      .append($('<a />', {
+        href: '/real/href', 'data-remote': 'true', 'data-method': 'delete', 'data-href': '/data/href'
+      }))
+  },
+  teardown: function() {
+    $.rails.href = realHref
+  }
+})
+
+asyncTest('the getter for an element\'s href is publicly accessible', 1, function() {
+  ok($.rails.href)
+  start()
+})
+
+asyncTest('the getter for an element\'s href is overridable', 1, function() {
+  $.rails.href = function(element) { return $(element).data('href') }
+  $('#qunit-fixture a')
+    .bindNative('ajax:beforeSend', function(e, xhr, options) {
+      equal('/data/href', options.url)
+      return false
+    })
+    .triggerNative('click')
+  start()
+})
+
+asyncTest('the getter for an element\'s href works normally if not overridden', 1, function() {
+  $('#qunit-fixture a')
+    .bindNative('ajax:beforeSend', function(e, xhr, options) {
+      equal(location.protocol + '//' + location.host + '/real/href', options.url)
+      return false
+    })
+    .triggerNative('click')
+  start()
+})
+
+asyncTest('the event selector strings are overridable', 1, function() {
+  ok($.rails.linkClickSelector.indexOf(', a[data-custom-remote-link]') != -1, 'linkClickSelector contains custom selector')
+  start()
+})
+
+asyncTest('including jquery-ujs multiple times throws error', 1, function() {
+  throws(function() {
+    Rails.start()
+  }, 'appending rails.js again throws error')
+  setTimeout(function() { start() }, 50)
+})
+
+})()
diff --git a/actionview/test/ujs/public/test/settings.js b/actionview/test/ujs/public/test/settings.js
new file mode 100644
index 0000000000..3375456f11
--- /dev/null
+++ b/actionview/test/ujs/public/test/settings.js
@@ -0,0 +1,116 @@
+var App = App || {}
+
+App.assertCallbackInvoked = function(callbackName) {
+  ok(true, callbackName + ' callback should have been invoked')
+}
+
+App.assertCallbackNotInvoked = function(callbackName) {
+  ok(false, callbackName + ' callback should not have been invoked')
+}
+
+App.assertGetRequest = function(requestEnv) {
+  equal(requestEnv['REQUEST_METHOD'], 'GET', 'request type should be GET')
+}
+
+App.assertPostRequest = function(requestEnv) {
+  equal(requestEnv['REQUEST_METHOD'], 'POST', 'request type should be POST')
+}
+
+App.assertRequestPath = function(requestEnv, path) {
+  equal(requestEnv['PATH_INFO'], path, 'request should be sent to right url')
+}
+
+App.getVal = function(el) {
+  return el.is('input,textarea,select') ? el.val() : el.text()
+}
+
+App.disabled = function(el) {
+  return el.is('input,textarea,select,button') ?
+    (el.is(':disabled') && $.rails.getData(el[0], 'ujs:disabled')) :
+    $.rails.getData(el[0], 'ujs:disabled')
+}
+
+App.checkEnabledState = function(el, text) {
+  ok(!App.disabled(el), el.get(0).tagName + ' should not be disabled')
+  equal(App.getVal(el), text, el.get(0).tagName + ' text should be original value')
+}
+
+App.checkDisabledState = function(el, text) {
+  ok(App.disabled(el), el.get(0).tagName + ' should be disabled')
+  equal(App.getVal(el), text, el.get(0).tagName + ' text should be disabled value')
+}
+
+// hijacks normal form submit; lets it submit to an iframe to prevent
+// navigating away from the test suite
+$(document).bind('submit', function(e) {
+  if (!e.isDefaultPrevented()) {
+    var form = $(e.target), action = form.attr('action'),
+        name = 'form-frame' + jQuery.guid++,
+        iframe = $('<iframe name="' + name + '" />'),
+        iframeInput = '<input name="iframe" value="true" type="hidden" />'
+        targetInput = '<input name="_target" value="' + (form.attr('target') || '') + '" type="hidden" />'
+
+    if (action && action.indexOf('iframe') < 0) {
+      if (action.indexOf('?') < 0) {
+        form.attr('action', action + '?iframe=true')
+      } else {
+        form.attr('action', action + '&iframe=true')
+      }
+    }
+    form.attr('target', name).append(iframeInput, targetInput)
+    $('#qunit-fixture').append(iframe)
+    $.event.trigger('iframe:loading', form)
+  }
+})
+
+var MouseEvent = window.MouseEvent
+
+try {
+  new MouseEvent()
+} catch (e) {
+  MouseEvent = function(type, options) {
+    var evt = document.createEvent('MouseEvents')
+    evt.initMouseEvent(type, options.bubbles, options.cancelable, window, options.detail, 0, 0, 80, 20, options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, 0, null)
+    return evt
+  }
+}
+
+$.fn.extend({
+  // trigger an native click event
+  triggerNative: function(type, options) {
+    var el = this[0],
+        event,
+        Evt = {
+          'click': MouseEvent,
+          'change': Event,
+          'pageshow': PageTransitionEvent,
+          'submit': Event
+        }[type]
+
+    options = options || {}
+    options.bubbles = true
+    options.cancelable = true
+
+    event = new Evt(type, options)
+
+    el.dispatchEvent(event)
+
+    if (type === 'submit' && !event.defaultPrevented) {
+      el.submit()
+    }
+    return this
+  },
+  bindNative: function(event, handler) {
+    if (!handler) return this
+
+    this.bind(event, function(e) {
+      var args = []
+      if (e.originalEvent.detail) {
+        args = e.originalEvent.detail.slice()
+      }
+      args.unshift(e)
+      return handler.apply(this, args)
+    })
+    return this
+  }
+})
diff --git a/actionview/test/ujs/public/vendor/jquery.metadata.js b/actionview/test/ujs/public/vendor/jquery.metadata.js
new file mode 100644
index 0000000000..ad8bfba404
--- /dev/null
+++ b/actionview/test/ujs/public/vendor/jquery.metadata.js
@@ -0,0 +1,122 @@
+/*
+ * Metadata - jQuery plugin for parsing metadata from elements
+ *
+ * Copyright (c) 2006 John Resig, Yehuda Katz, J�örn Zaefferer, Paul McLanahan
+ *
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ *
+ * Revision: $Id: jquery.metadata.js 4187 2007-12-16 17:15:27Z joern.zaefferer $
+ *
+ */
+
+/**
+ * Sets the type of metadata to use. Metadata is encoded in JSON, and each property
+ * in the JSON will become a property of the element itself.
+ *
+ * There are three supported types of metadata storage:
+ *
+ *   attr:  Inside an attribute. The name parameter indicates *which* attribute.
+ *          
+ *   class: Inside the class attribute, wrapped in curly braces: { }
+ *   
+ *   elem:  Inside a child element (e.g. a script tag). The
+ *          name parameter indicates *which* element.
+ *          
+ * The metadata for an element is loaded the first time the element is accessed via jQuery.
+ *
+ * As a result, you can define the metadata type, use $(expr) to load the metadata into the elements
+ * matched by expr, then redefine the metadata type and run another $(expr) for other elements.
+ * 
+ * @name $.metadata.setType
+ *
+ * @example <p id="one" class="some_class {item_id: 1, item_label: 'Label'}">This is a p</p>
+ * @before $.metadata.setType("class")
+ * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label"
+ * @desc Reads metadata from the class attribute
+ * 
+ * @example <p id="one" class="some_class" data="{item_id: 1, item_label: 'Label'}">This is a p</p>
+ * @before $.metadata.setType("attr", "data")
+ * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label"
+ * @desc Reads metadata from a "data" attribute
+ * 
+ * @example <p id="one" class="some_class"><script>{item_id: 1, item_label: 'Label'}</script>This is a p</p>
+ * @before $.metadata.setType("elem", "script")
+ * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label"
+ * @desc Reads metadata from a nested script element
+ * 
+ * @param String type The encoding type
+ * @param String name The name of the attribute to be used to get metadata (optional)
+ * @cat Plugins/Metadata
+ * @descr Sets the type of encoding to be used when loading metadata for the first time
+ * @type undefined
+ * @see metadata()
+ */
+
+(function($) {
+
+$.extend({
+	metadata : {
+		defaults : {
+			type: 'class',
+			name: 'metadata',
+			cre: /({.*})/,
+			single: 'metadata'
+		},
+		setType: function( type, name ){
+			this.defaults.type = type;
+			this.defaults.name = name;
+		},
+		get: function( elem, opts ){
+			var settings = $.extend({},this.defaults,opts);
+			// check for empty string in single property
+			if ( !settings.single.length ) settings.single = 'metadata';
+			
+			var data = $.data(elem, settings.single);
+			// returned cached data if it already exists
+			if ( data ) return data;
+			
+			data = "{}";
+			
+			if ( settings.type == "class" ) {
+				var m = settings.cre.exec( elem.className );
+				if ( m )
+					data = m[1];
+			} else if ( settings.type == "elem" ) {
+				if( !elem.getElementsByTagName )
+					return undefined;
+				var e = elem.getElementsByTagName(settings.name);
+				if ( e.length )
+					data = $.trim(e[0].innerHTML);
+			} else if ( elem.getAttribute != undefined ) {
+				var attr = elem.getAttribute( settings.name );
+				if ( attr )
+					data = attr;
+			}
+			
+			if ( data.indexOf( '{' ) <0 )
+			data = "{" + data + "}";
+			
+			data = eval("(" + data + ")");
+			
+			$.data( elem, settings.single, data );
+			return data;
+		}
+	}
+});
+
+/**
+ * Returns the metadata object for the first member of the jQuery object.
+ *
+ * @name metadata
+ * @descr Returns element's metadata object
+ * @param Object opts An object contianing settings to override the defaults
+ * @type jQuery
+ * @cat Plugins/Metadata
+ */
+$.fn.metadata = function( opts ){
+	return $.metadata.get( this[0], opts );
+};
+
+})(jQuery);
\ No newline at end of file
diff --git a/actionview/test/ujs/public/vendor/qunit.css b/actionview/test/ujs/public/vendor/qunit.css
new file mode 100644
index 0000000000..93026e3ba3
--- /dev/null
+++ b/actionview/test/ujs/public/vendor/qunit.css
@@ -0,0 +1,237 @@
+/*!
+ * QUnit 1.14.0
+ * http://qunitjs.com/
+ *
+ * Copyright 2013 jQuery Foundation and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ *
+ * Date: 2014-01-31T16:40Z
+ */
+
+/** Font Family and Sizes */
+
+#qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult {
+	font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif;
+}
+
+#qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; }
+#qunit-tests { font-size: smaller; }
+
+
+/** Resets */
+
+#qunit-tests, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult, #qunit-modulefilter {
+	margin: 0;
+	padding: 0;
+}
+
+
+/** Header */
+
+#qunit-header {
+	padding: 0.5em 0 0.5em 1em;
+
+	color: #8699A4;
+	background-color: #0D3349;
+
+	font-size: 1.5em;
+	line-height: 1em;
+	font-weight: 400;
+
+	border-radius: 5px 5px 0 0;
+}
+
+#qunit-header a {
+	text-decoration: none;
+	color: #C2CCD1;
+}
+
+#qunit-header a:hover,
+#qunit-header a:focus {
+	color: #FFF;
+}
+
+#qunit-testrunner-toolbar label {
+	display: inline-block;
+	padding: 0 0.5em 0 0.1em;
+}
+
+#qunit-banner {
+	height: 5px;
+}
+
+#qunit-testrunner-toolbar {
+	padding: 0.5em 0 0.5em 2em;
+	color: #5E740B;
+	background-color: #EEE;
+	overflow: hidden;
+}
+
+#qunit-userAgent {
+	padding: 0.5em 0 0.5em 2.5em;
+	background-color: #2B81AF;
+	color: #FFF;
+	text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
+}
+
+#qunit-modulefilter-container {
+	float: right;
+}
+
+/** Tests: Pass/Fail */
+
+#qunit-tests {
+	list-style-position: inside;
+}
+
+#qunit-tests li {
+	padding: 0.4em 0.5em 0.4em 2.5em;
+	border-bottom: 1px solid #FFF;
+	list-style-position: inside;
+}
+
+#qunit-tests.hidepass li.pass, #qunit-tests.hidepass li.running  {
+	display: none;
+}
+
+#qunit-tests li strong {
+	cursor: pointer;
+}
+
+#qunit-tests li a {
+	padding: 0.5em;
+	color: #C2CCD1;
+	text-decoration: none;
+}
+#qunit-tests li a:hover,
+#qunit-tests li a:focus {
+	color: #000;
+}
+
+#qunit-tests li .runtime {
+	float: right;
+	font-size: smaller;
+}
+
+.qunit-assert-list {
+	margin-top: 0.5em;
+	padding: 0.5em;
+
+	background-color: #FFF;
+
+	border-radius: 5px;
+}
+
+.qunit-collapsed {
+	display: none;
+}
+
+#qunit-tests table {
+	border-collapse: collapse;
+	margin-top: 0.2em;
+}
+
+#qunit-tests th {
+	text-align: right;
+	vertical-align: top;
+	padding: 0 0.5em 0 0;
+}
+
+#qunit-tests td {
+	vertical-align: top;
+}
+
+#qunit-tests pre {
+	margin: 0;
+	white-space: pre-wrap;
+	word-wrap: break-word;
+}
+
+#qunit-tests del {
+	background-color: #E0F2BE;
+	color: #374E0C;
+	text-decoration: none;
+}
+
+#qunit-tests ins {
+	background-color: #FFCACA;
+	color: #500;
+	text-decoration: none;
+}
+
+/*** Test Counts */
+
+#qunit-tests b.counts                       { color: #000; }
+#qunit-tests b.passed                       { color: #5E740B; }
+#qunit-tests b.failed                       { color: #710909; }
+
+#qunit-tests li li {
+	padding: 5px;
+	background-color: #FFF;
+	border-bottom: none;
+	list-style-position: inside;
+}
+
+/*** Passing Styles */
+
+#qunit-tests li li.pass {
+	color: #3C510C;
+	background-color: #FFF;
+	border-left: 10px solid #C6E746;
+}
+
+#qunit-tests .pass                          { color: #528CE0; background-color: #D2E0E6; }
+#qunit-tests .pass .test-name               { color: #366097; }
+
+#qunit-tests .pass .test-actual,
+#qunit-tests .pass .test-expected           { color: #999; }
+
+#qunit-banner.qunit-pass                    { background-color: #C6E746; }
+
+/*** Failing Styles */
+
+#qunit-tests li li.fail {
+	color: #710909;
+	background-color: #FFF;
+	border-left: 10px solid #EE5757;
+	white-space: pre;
+}
+
+#qunit-tests > li:last-child {
+	border-radius: 0 0 5px 5px;
+}
+
+#qunit-tests .fail                          { color: #000; background-color: #EE5757; }
+#qunit-tests .fail .test-name,
+#qunit-tests .fail .module-name             { color: #000; }
+
+#qunit-tests .fail .test-actual             { color: #EE5757; }
+#qunit-tests .fail .test-expected           { color: #008000; }
+
+#qunit-banner.qunit-fail                    { background-color: #EE5757; }
+
+
+/** Result */
+
+#qunit-testresult {
+	padding: 0.5em 0.5em 0.5em 2.5em;
+
+	color: #2B81AF;
+	background-color: #D2E0E6;
+
+	border-bottom: 1px solid #FFF;
+}
+#qunit-testresult .module-name {
+	font-weight: 700;
+}
+
+/** Fixture */
+
+#qunit-fixture {
+	position: absolute;
+	top: -10000px;
+	left: -10000px;
+	width: 1000px;
+	height: 1000px;
+}
diff --git a/actionview/test/ujs/public/vendor/qunit.js b/actionview/test/ujs/public/vendor/qunit.js
new file mode 100644
index 0000000000..0e279fde17
--- /dev/null
+++ b/actionview/test/ujs/public/vendor/qunit.js
@@ -0,0 +1,2288 @@
+/*!
+ * QUnit 1.14.0
+ * http://qunitjs.com/
+ *
+ * Copyright 2013 jQuery Foundation and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ *
+ * Date: 2014-01-31T16:40Z
+ */
+
+(function( window ) {
+
+var QUnit,
+	assert,
+	config,
+	onErrorFnPrev,
+	testId = 0,
+	fileName = (sourceFromStacktrace( 0 ) || "" ).replace(/(:\d+)+\)?/, "").replace(/.+\//, ""),
+	toString = Object.prototype.toString,
+	hasOwn = Object.prototype.hasOwnProperty,
+	// Keep a local reference to Date (GH-283)
+	Date = window.Date,
+	setTimeout = window.setTimeout,
+	clearTimeout = window.clearTimeout,
+	defined = {
+		document: typeof window.document !== "undefined",
+		setTimeout: typeof window.setTimeout !== "undefined",
+		sessionStorage: (function() {
+			var x = "qunit-test-string";
+			try {
+				sessionStorage.setItem( x, x );
+				sessionStorage.removeItem( x );
+				return true;
+			} catch( e ) {
+				return false;
+			}
+		}())
+	},
+	/**
+	 * Provides a normalized error string, correcting an issue
+	 * with IE 7 (and prior) where Error.prototype.toString is
+	 * not properly implemented
+	 *
+	 * Based on http://es5.github.com/#x15.11.4.4
+	 *
+	 * @param {String|Error} error
+	 * @return {String} error message
+	 */
+	errorString = function( error ) {
+		var name, message,
+			errorString = error.toString();
+		if ( errorString.substring( 0, 7 ) === "[object" ) {
+			name = error.name ? error.name.toString() : "Error";
+			message = error.message ? error.message.toString() : "";
+			if ( name && message ) {
+				return name + ": " + message;
+			} else if ( name ) {
+				return name;
+			} else if ( message ) {
+				return message;
+			} else {
+				return "Error";
+			}
+		} else {
+			return errorString;
+		}
+	},
+	/**
+	 * Makes a clone of an object using only Array or Object as base,
+	 * and copies over the own enumerable properties.
+	 *
+	 * @param {Object} obj
+	 * @return {Object} New object with only the own properties (recursively).
+	 */
+	objectValues = function( obj ) {
+		// Grunt 0.3.x uses an older version of jshint that still has jshint/jshint#392.
+		/*jshint newcap: false */
+		var key, val,
+			vals = QUnit.is( "array", obj ) ? [] : {};
+		for ( key in obj ) {
+			if ( hasOwn.call( obj, key ) ) {
+				val = obj[key];
+				vals[key] = val === Object(val) ? objectValues(val) : val;
+			}
+		}
+		return vals;
+	};
+
+
+// Root QUnit object.
+// `QUnit` initialized at top of scope
+QUnit = {
+
+	// call on start of module test to prepend name to all tests
+	module: function( name, testEnvironment ) {
+		config.currentModule = name;
+		config.currentModuleTestEnvironment = testEnvironment;
+		config.modules[name] = true;
+	},
+
+	asyncTest: function( testName, expected, callback ) {
+		if ( arguments.length === 2 ) {
+			callback = expected;
+			expected = null;
+		}
+
+		QUnit.test( testName, expected, callback, true );
+	},
+
+	test: function( testName, expected, callback, async ) {
+		var test,
+			nameHtml = "<span class='test-name'>" + escapeText( testName ) + "</span>";
+
+		if ( arguments.length === 2 ) {
+			callback = expected;
+			expected = null;
+		}
+
+		if ( config.currentModule ) {
+			nameHtml = "<span class='module-name'>" + escapeText( config.currentModule ) + "</span>: " + nameHtml;
+		}
+
+		test = new Test({
+			nameHtml: nameHtml,
+			testName: testName,
+			expected: expected,
+			async: async,
+			callback: callback,
+			module: config.currentModule,
+			moduleTestEnvironment: config.currentModuleTestEnvironment,
+			stack: sourceFromStacktrace( 2 )
+		});
+
+		if ( !validTest( test ) ) {
+			return;
+		}
+
+		test.queue();
+	},
+
+	// Specify the number of expected assertions to guarantee that failed test (no assertions are run at all) don't slip through.
+	expect: function( asserts ) {
+		if (arguments.length === 1) {
+			config.current.expected = asserts;
+		} else {
+			return config.current.expected;
+		}
+	},
+
+	start: function( count ) {
+		// QUnit hasn't been initialized yet.
+		// Note: RequireJS (et al) may delay onLoad
+		if ( config.semaphore === undefined ) {
+			QUnit.begin(function() {
+				// This is triggered at the top of QUnit.load, push start() to the event loop, to allow QUnit.load to finish first
+				setTimeout(function() {
+					QUnit.start( count );
+				});
+			});
+			return;
+		}
+
+		config.semaphore -= count || 1;
+		// don't start until equal number of stop-calls
+		if ( config.semaphore > 0 ) {
+			return;
+		}
+		// ignore if start is called more often then stop
+		if ( config.semaphore < 0 ) {
+			config.semaphore = 0;
+			QUnit.pushFailure( "Called start() while already started (QUnit.config.semaphore was 0 already)", null, sourceFromStacktrace(2) );
+			return;
+		}
+		// A slight delay, to avoid any current callbacks
+		if ( defined.setTimeout ) {
+			setTimeout(function() {
+				if ( config.semaphore > 0 ) {
+					return;
+				}
+				if ( config.timeout ) {
+					clearTimeout( config.timeout );
+				}
+
+				config.blocking = false;
+				process( true );
+			}, 13);
+		} else {
+			config.blocking = false;
+			process( true );
+		}
+	},
+
+	stop: function( count ) {
+		config.semaphore += count || 1;
+		config.blocking = true;
+
+		if ( config.testTimeout && defined.setTimeout ) {
+			clearTimeout( config.timeout );
+			config.timeout = setTimeout(function() {
+				QUnit.ok( false, "Test timed out" );
+				config.semaphore = 1;
+				QUnit.start();
+			}, config.testTimeout );
+		}
+	}
+};
+
+// We use the prototype to distinguish between properties that should
+// be exposed as globals (and in exports) and those that shouldn't
+(function() {
+	function F() {}
+	F.prototype = QUnit;
+	QUnit = new F();
+	// Make F QUnit's constructor so that we can add to the prototype later
+	QUnit.constructor = F;
+}());
+
+/**
+ * Config object: Maintain internal state
+ * Later exposed as QUnit.config
+ * `config` initialized at top of scope
+ */
+config = {
+	// The queue of tests to run
+	queue: [],
+
+	// block until document ready
+	blocking: true,
+
+	// when enabled, show only failing tests
+	// gets persisted through sessionStorage and can be changed in UI via checkbox
+	hidepassed: false,
+
+	// by default, run previously failed tests first
+	// very useful in combination with "Hide passed tests" checked
+	reorder: true,
+
+	// by default, modify document.title when suite is done
+	altertitle: true,
+
+	// by default, scroll to top of the page when suite is done
+	scrolltop: true,
+
+	// when enabled, all tests must call expect()
+	requireExpects: false,
+
+	// add checkboxes that are persisted in the query-string
+	// when enabled, the id is set to `true` as a `QUnit.config` property
+	urlConfig: [
+		{
+			id: "noglobals",
+			label: "Check for Globals",
+			tooltip: "Enabling this will test if any test introduces new properties on the `window` object. Stored as query-strings."
+		},
+		{
+			id: "notrycatch",
+			label: "No try-catch",
+			tooltip: "Enabling this will run tests outside of a try-catch block. Makes debugging exceptions in IE reasonable. Stored as query-strings."
+		}
+	],
+
+	// Set of all modules.
+	modules: {},
+
+	// logging callback queues
+	begin: [],
+	done: [],
+	log: [],
+	testStart: [],
+	testDone: [],
+	moduleStart: [],
+	moduleDone: []
+};
+
+// Initialize more QUnit.config and QUnit.urlParams
+(function() {
+	var i, current,
+		location = window.location || { search: "", protocol: "file:" },
+		params = location.search.slice( 1 ).split( "&" ),
+		length = params.length,
+		urlParams = {};
+
+	if ( params[ 0 ] ) {
+		for ( i = 0; i < length; i++ ) {
+			current = params[ i ].split( "=" );
+			current[ 0 ] = decodeURIComponent( current[ 0 ] );
+
+			// allow just a key to turn on a flag, e.g., test.html?noglobals
+			current[ 1 ] = current[ 1 ] ? decodeURIComponent( current[ 1 ] ) : true;
+			if ( urlParams[ current[ 0 ] ] ) {
+				urlParams[ current[ 0 ] ] = [].concat( urlParams[ current[ 0 ] ], current[ 1 ] );
+			} else {
+				urlParams[ current[ 0 ] ] = current[ 1 ];
+			}
+		}
+	}
+
+	QUnit.urlParams = urlParams;
+
+	// String search anywhere in moduleName+testName
+	config.filter = urlParams.filter;
+
+	// Exact match of the module name
+	config.module = urlParams.module;
+
+	config.testNumber = [];
+	if ( urlParams.testNumber ) {
+
+		// Ensure that urlParams.testNumber is an array
+		urlParams.testNumber = [].concat( urlParams.testNumber );
+		for ( i = 0; i < urlParams.testNumber.length; i++ ) {
+			current = urlParams.testNumber[ i ];
+			config.testNumber.push( parseInt( current, 10 ) );
+		}
+	}
+
+	// Figure out if we're running the tests from a server or not
+	QUnit.isLocal = location.protocol === "file:";
+}());
+
+extend( QUnit, {
+
+	config: config,
+
+	// Initialize the configuration options
+	init: function() {
+		extend( config, {
+			stats: { all: 0, bad: 0 },
+			moduleStats: { all: 0, bad: 0 },
+			started: +new Date(),
+			updateRate: 1000,
+			blocking: false,
+			autostart: true,
+			autorun: false,
+			filter: "",
+			queue: [],
+			semaphore: 1
+		});
+
+		var tests, banner, result,
+			qunit = id( "qunit" );
+
+		if ( qunit ) {
+			qunit.innerHTML =
+				"<h1 id='qunit-header'>" + escapeText( document.title ) + "</h1>" +
+				"<h2 id='qunit-banner'></h2>" +
+				"<div id='qunit-testrunner-toolbar'></div>" +
+				"<h2 id='qunit-userAgent'></h2>" +
+				"<ol id='qunit-tests'></ol>";
+		}
+
+		tests = id( "qunit-tests" );
+		banner = id( "qunit-banner" );
+		result = id( "qunit-testresult" );
+
+		if ( tests ) {
+			tests.innerHTML = "";
+		}
+
+		if ( banner ) {
+			banner.className = "";
+		}
+
+		if ( result ) {
+			result.parentNode.removeChild( result );
+		}
+
+		if ( tests ) {
+			result = document.createElement( "p" );
+			result.id = "qunit-testresult";
+			result.className = "result";
+			tests.parentNode.insertBefore( result, tests );
+			result.innerHTML = "Running...<br/>&nbsp;";
+		}
+	},
+
+	// Resets the test setup. Useful for tests that modify the DOM.
+	/*
+	DEPRECATED: Use multiple tests instead of resetting inside a test.
+	Use testStart or testDone for custom cleanup.
+	This method will throw an error in 2.0, and will be removed in 2.1
+	*/
+	reset: function() {
+		var fixture = id( "qunit-fixture" );
+		if ( fixture ) {
+			fixture.innerHTML = config.fixture;
+		}
+	},
+
+	// Safe object type checking
+	is: function( type, obj ) {
+		return QUnit.objectType( obj ) === type;
+	},
+
+	objectType: function( obj ) {
+		if ( typeof obj === "undefined" ) {
+			return "undefined";
+		}
+
+		// Consider: typeof null === object
+		if ( obj === null ) {
+			return "null";
+		}
+
+		var match = toString.call( obj ).match(/^\[object\s(.*)\]$/),
+			type = match && match[1] || "";
+
+		switch ( type ) {
+			case "Number":
+				if ( isNaN(obj) ) {
+					return "nan";
+				}
+				return "number";
+			case "String":
+			case "Boolean":
+			case "Array":
+			case "Date":
+			case "RegExp":
+			case "Function":
+				return type.toLowerCase();
+		}
+		if ( typeof obj === "object" ) {
+			return "object";
+		}
+		return undefined;
+	},
+
+	push: function( result, actual, expected, message ) {
+		if ( !config.current ) {
+			throw new Error( "assertion outside test context, was " + sourceFromStacktrace() );
+		}
+
+		var output, source,
+			details = {
+				module: config.current.module,
+				name: config.current.testName,
+				result: result,
+				message: message,
+				actual: actual,
+				expected: expected
+			};
+
+		message = escapeText( message ) || ( result ? "okay" : "failed" );
+		message = "<span class='test-message'>" + message + "</span>";
+		output = message;
+
+		if ( !result ) {
+			expected = escapeText( QUnit.jsDump.parse(expected) );
+			actual = escapeText( QUnit.jsDump.parse(actual) );
+			output += "<table><tr class='test-expected'><th>Expected: </th><td><pre>" + expected + "</pre></td></tr>";
+
+			if ( actual !== expected ) {
+				output += "<tr class='test-actual'><th>Result: </th><td><pre>" + actual + "</pre></td></tr>";
+				output += "<tr class='test-diff'><th>Diff: </th><td><pre>" + QUnit.diff( expected, actual ) + "</pre></td></tr>";
+			}
+
+			source = sourceFromStacktrace();
+
+			if ( source ) {
+				details.source = source;
+				output += "<tr class='test-source'><th>Source: </th><td><pre>" + escapeText( source ) + "</pre></td></tr>";
+			}
+
+			output += "</table>";
+		}
+
+		runLoggingCallbacks( "log", QUnit, details );
+
+		config.current.assertions.push({
+			result: !!result,
+			message: output
+		});
+	},
+
+	pushFailure: function( message, source, actual ) {
+		if ( !config.current ) {
+			throw new Error( "pushFailure() assertion outside test context, was " + sourceFromStacktrace(2) );
+		}
+
+		var output,
+			details = {
+				module: config.current.module,
+				name: config.current.testName,
+				result: false,
+				message: message
+			};
+
+		message = escapeText( message ) || "error";
+		message = "<span class='test-message'>" + message + "</span>";
+		output = message;
+
+		output += "<table>";
+
+		if ( actual ) {
+			output += "<tr class='test-actual'><th>Result: </th><td><pre>" + escapeText( actual ) + "</pre></td></tr>";
+		}
+
+		if ( source ) {
+			details.source = source;
+			output += "<tr class='test-source'><th>Source: </th><td><pre>" + escapeText( source ) + "</pre></td></tr>";
+		}
+
+		output += "</table>";
+
+		runLoggingCallbacks( "log", QUnit, details );
+
+		config.current.assertions.push({
+			result: false,
+			message: output
+		});
+	},
+
+	url: function( params ) {
+		params = extend( extend( {}, QUnit.urlParams ), params );
+		var key,
+			querystring = "?";
+
+		for ( key in params ) {
+			if ( hasOwn.call( params, key ) ) {
+				querystring += encodeURIComponent( key ) + "=" +
+					encodeURIComponent( params[ key ] ) + "&";
+			}
+		}
+		return window.location.protocol + "//" + window.location.host +
+			window.location.pathname + querystring.slice( 0, -1 );
+	},
+
+	extend: extend,
+	id: id,
+	addEvent: addEvent,
+	addClass: addClass,
+	hasClass: hasClass,
+	removeClass: removeClass
+	// load, equiv, jsDump, diff: Attached later
+});
+
+/**
+ * @deprecated: Created for backwards compatibility with test runner that set the hook function
+ * into QUnit.{hook}, instead of invoking it and passing the hook function.
+ * QUnit.constructor is set to the empty F() above so that we can add to it's prototype here.
+ * Doing this allows us to tell if the following methods have been overwritten on the actual
+ * QUnit object.
+ */
+extend( QUnit.constructor.prototype, {
+
+	// Logging callbacks; all receive a single argument with the listed properties
+	// run test/logs.html for any related changes
+	begin: registerLoggingCallback( "begin" ),
+
+	// done: { failed, passed, total, runtime }
+	done: registerLoggingCallback( "done" ),
+
+	// log: { result, actual, expected, message }
+	log: registerLoggingCallback( "log" ),
+
+	// testStart: { name }
+	testStart: registerLoggingCallback( "testStart" ),
+
+	// testDone: { name, failed, passed, total, runtime }
+	testDone: registerLoggingCallback( "testDone" ),
+
+	// moduleStart: { name }
+	moduleStart: registerLoggingCallback( "moduleStart" ),
+
+	// moduleDone: { name, failed, passed, total }
+	moduleDone: registerLoggingCallback( "moduleDone" )
+});
+
+if ( !defined.document || document.readyState === "complete" ) {
+	config.autorun = true;
+}
+
+QUnit.load = function() {
+	runLoggingCallbacks( "begin", QUnit, {} );
+
+	// Initialize the config, saving the execution queue
+	var banner, filter, i, j, label, len, main, ol, toolbar, val, selection,
+		urlConfigContainer, moduleFilter, userAgent,
+		numModules = 0,
+		moduleNames = [],
+		moduleFilterHtml = "",
+		urlConfigHtml = "",
+		oldconfig = extend( {}, config );
+
+	QUnit.init();
+	extend(config, oldconfig);
+
+	config.blocking = false;
+
+	len = config.urlConfig.length;
+
+	for ( i = 0; i < len; i++ ) {
+		val = config.urlConfig[i];
+		if ( typeof val === "string" ) {
+			val = {
+				id: val,
+				label: val
+			};
+		}
+		config[ val.id ] = QUnit.urlParams[ val.id ];
+		if ( !val.value || typeof val.value === "string" ) {
+			urlConfigHtml += "<input id='qunit-urlconfig-" + escapeText( val.id ) +
+				"' name='" + escapeText( val.id ) +
+				"' type='checkbox'" +
+				( val.value ? " value='" + escapeText( val.value ) + "'" : "" ) +
+				( config[ val.id ] ? " checked='checked'" : "" ) +
+				" title='" + escapeText( val.tooltip ) +
+				"'><label for='qunit-urlconfig-" + escapeText( val.id ) +
+				"' title='" + escapeText( val.tooltip ) + "'>" + val.label + "</label>";
+		} else {
+			urlConfigHtml += "<label for='qunit-urlconfig-" + escapeText( val.id ) +
+				"' title='" + escapeText( val.tooltip ) +
+				"'>" + val.label +
+				": </label><select id='qunit-urlconfig-" + escapeText( val.id ) +
+				"' name='" + escapeText( val.id ) +
+				"' title='" + escapeText( val.tooltip ) +
+				"'><option></option>";
+			selection = false;
+			if ( QUnit.is( "array", val.value ) ) {
+				for ( j = 0; j < val.value.length; j++ ) {
+					urlConfigHtml += "<option value='" + escapeText( val.value[j] ) + "'" +
+						( config[ val.id ] === val.value[j] ?
+							(selection = true) && " selected='selected'" :
+							"" ) +
+						">" + escapeText( val.value[j] ) + "</option>";
+				}
+			} else {
+				for ( j in val.value ) {
+					if ( hasOwn.call( val.value, j ) ) {
+						urlConfigHtml += "<option value='" + escapeText( j ) + "'" +
+							( config[ val.id ] === j ?
+								(selection = true) && " selected='selected'" :
+								"" ) +
+							">" + escapeText( val.value[j] ) + "</option>";
+					}
+				}
+			}
+			if ( config[ val.id ] && !selection ) {
+				urlConfigHtml += "<option value='" + escapeText( config[ val.id ] ) +
+					"' selected='selected' disabled='disabled'>" +
+					escapeText( config[ val.id ] ) +
+					"</option>";
+			}
+			urlConfigHtml += "</select>";
+		}
+	}
+	for ( i in config.modules ) {
+		if ( config.modules.hasOwnProperty( i ) ) {
+			moduleNames.push(i);
+		}
+	}
+	numModules = moduleNames.length;
+	moduleNames.sort( function( a, b ) {
+		return a.localeCompare( b );
+	});
+	moduleFilterHtml += "<label for='qunit-modulefilter'>Module: </label><select id='qunit-modulefilter' name='modulefilter'><option value='' " +
+		( config.module === undefined  ? "selected='selected'" : "" ) +
+		">< All Modules ></option>";
+
+
+	for ( i = 0; i < numModules; i++) {
+			moduleFilterHtml += "<option value='" + escapeText( encodeURIComponent(moduleNames[i]) ) + "' " +
+				( config.module === moduleNames[i] ? "selected='selected'" : "" ) +
+				">" + escapeText(moduleNames[i]) + "</option>";
+	}
+	moduleFilterHtml += "</select>";
+
+	// `userAgent` initialized at top of scope
+	userAgent = id( "qunit-userAgent" );
+	if ( userAgent ) {
+		userAgent.innerHTML = navigator.userAgent;
+	}
+
+	// `banner` initialized at top of scope
+	banner = id( "qunit-header" );
+	if ( banner ) {
+		banner.innerHTML = "<a href='" + QUnit.url({ filter: undefined, module: undefined, testNumber: undefined }) + "'>" + banner.innerHTML + "</a> ";
+	}
+
+	// `toolbar` initialized at top of scope
+	toolbar = id( "qunit-testrunner-toolbar" );
+	if ( toolbar ) {
+		// `filter` initialized at top of scope
+		filter = document.createElement( "input" );
+		filter.type = "checkbox";
+		filter.id = "qunit-filter-pass";
+
+		addEvent( filter, "click", function() {
+			var tmp,
+				ol = id( "qunit-tests" );
+
+			if ( filter.checked ) {
+				ol.className = ol.className + " hidepass";
+			} else {
+				tmp = " " + ol.className.replace( /[\n\t\r]/g, " " ) + " ";
+				ol.className = tmp.replace( / hidepass /, " " );
+			}
+			if ( defined.sessionStorage ) {
+				if (filter.checked) {
+					sessionStorage.setItem( "qunit-filter-passed-tests", "true" );
+				} else {
+					sessionStorage.removeItem( "qunit-filter-passed-tests" );
+				}
+			}
+		});
+
+		if ( config.hidepassed || defined.sessionStorage && sessionStorage.getItem( "qunit-filter-passed-tests" ) ) {
+			filter.checked = true;
+			// `ol` initialized at top of scope
+			ol = id( "qunit-tests" );
+			ol.className = ol.className + " hidepass";
+		}
+		toolbar.appendChild( filter );
+
+		// `label` initialized at top of scope
+		label = document.createElement( "label" );
+		label.setAttribute( "for", "qunit-filter-pass" );
+		label.setAttribute( "title", "Only show tests and assertions that fail. Stored in sessionStorage." );
+		label.innerHTML = "Hide passed tests";
+		toolbar.appendChild( label );
+
+		urlConfigContainer = document.createElement("span");
+		urlConfigContainer.innerHTML = urlConfigHtml;
+		// For oldIE support:
+		// * Add handlers to the individual elements instead of the container
+		// * Use "click" instead of "change" for checkboxes
+		// * Fallback from event.target to event.srcElement
+		addEvents( urlConfigContainer.getElementsByTagName("input"), "click", function( event ) {
+			var params = {},
+				target = event.target || event.srcElement;
+			params[ target.name ] = target.checked ?
+				target.defaultValue || true :
+				undefined;
+			window.location = QUnit.url( params );
+		});
+		addEvents( urlConfigContainer.getElementsByTagName("select"), "change", function( event ) {
+			var params = {},
+				target = event.target || event.srcElement;
+			params[ target.name ] = target.options[ target.selectedIndex ].value || undefined;
+			window.location = QUnit.url( params );
+		});
+		toolbar.appendChild( urlConfigContainer );
+
+		if (numModules > 1) {
+			moduleFilter = document.createElement( "span" );
+			moduleFilter.setAttribute( "id", "qunit-modulefilter-container" );
+			moduleFilter.innerHTML = moduleFilterHtml;
+			addEvent( moduleFilter.lastChild, "change", function() {
+				var selectBox = moduleFilter.getElementsByTagName("select")[0],
+					selectedModule = decodeURIComponent(selectBox.options[selectBox.selectedIndex].value);
+
+				window.location = QUnit.url({
+					module: ( selectedModule === "" ) ? undefined : selectedModule,
+					// Remove any existing filters
+					filter: undefined,
+					testNumber: undefined
+				});
+			});
+			toolbar.appendChild(moduleFilter);
+		}
+	}
+
+	// `main` initialized at top of scope
+	main = id( "qunit-fixture" );
+	if ( main ) {
+		config.fixture = main.innerHTML;
+	}
+
+	if ( config.autostart ) {
+		QUnit.start();
+	}
+};
+
+if ( defined.document ) {
+	addEvent( window, "load", QUnit.load );
+}
+
+// `onErrorFnPrev` initialized at top of scope
+// Preserve other handlers
+onErrorFnPrev = window.onerror;
+
+// Cover uncaught exceptions
+// Returning true will suppress the default browser handler,
+// returning false will let it run.
+window.onerror = function ( error, filePath, linerNr ) {
+	var ret = false;
+	if ( onErrorFnPrev ) {
+		ret = onErrorFnPrev( error, filePath, linerNr );
+	}
+
+	// Treat return value as window.onerror itself does,
+	// Only do our handling if not suppressed.
+	if ( ret !== true ) {
+		if ( QUnit.config.current ) {
+			if ( QUnit.config.current.ignoreGlobalErrors ) {
+				return true;
+			}
+			QUnit.pushFailure( error, filePath + ":" + linerNr );
+		} else {
+			QUnit.test( "global failure", extend( function() {
+				QUnit.pushFailure( error, filePath + ":" + linerNr );
+			}, { validTest: validTest } ) );
+		}
+		return false;
+	}
+
+	return ret;
+};
+
+function done() {
+	config.autorun = true;
+
+	// Log the last module results
+	if ( config.previousModule ) {
+		runLoggingCallbacks( "moduleDone", QUnit, {
+			name: config.previousModule,
+			failed: config.moduleStats.bad,
+			passed: config.moduleStats.all - config.moduleStats.bad,
+			total: config.moduleStats.all
+		});
+	}
+	delete config.previousModule;
+
+	var i, key,
+		banner = id( "qunit-banner" ),
+		tests = id( "qunit-tests" ),
+		runtime = +new Date() - config.started,
+		passed = config.stats.all - config.stats.bad,
+		html = [
+			"Tests completed in ",
+			runtime,
+			" milliseconds.<br/>",
+			"<span class='passed'>",
+			passed,
+			"</span> assertions of <span class='total'>",
+			config.stats.all,
+			"</span> passed, <span class='failed'>",
+			config.stats.bad,
+			"</span> failed."
+		].join( "" );
+
+	if ( banner ) {
+		banner.className = ( config.stats.bad ? "qunit-fail" : "qunit-pass" );
+	}
+
+	if ( tests ) {
+		id( "qunit-testresult" ).innerHTML = html;
+	}
+
+	if ( config.altertitle && defined.document && document.title ) {
+		// show ✖ for good, ✔ for bad suite result in title
+		// use escape sequences in case file gets loaded with non-utf-8-charset
+		document.title = [
+			( config.stats.bad ? "\u2716" : "\u2714" ),
+			document.title.replace( /^[\u2714\u2716] /i, "" )
+		].join( " " );
+	}
+
+	// clear own sessionStorage items if all tests passed
+	if ( config.reorder && defined.sessionStorage && config.stats.bad === 0 ) {
+		// `key` & `i` initialized at top of scope
+		for ( i = 0; i < sessionStorage.length; i++ ) {
+			key = sessionStorage.key( i++ );
+			if ( key.indexOf( "qunit-test-" ) === 0 ) {
+				sessionStorage.removeItem( key );
+			}
+		}
+	}
+
+	// scroll back to top to show results
+	if ( config.scrolltop && window.scrollTo ) {
+		window.scrollTo(0, 0);
+	}
+
+	runLoggingCallbacks( "done", QUnit, {
+		failed: config.stats.bad,
+		passed: passed,
+		total: config.stats.all,
+		runtime: runtime
+	});
+}
+
+/** @return Boolean: true if this test should be ran */
+function validTest( test ) {
+	var include,
+		filter = config.filter && config.filter.toLowerCase(),
+		module = config.module && config.module.toLowerCase(),
+		fullName = ( test.module + ": " + test.testName ).toLowerCase();
+
+	// Internally-generated tests are always valid
+	if ( test.callback && test.callback.validTest === validTest ) {
+		delete test.callback.validTest;
+		return true;
+	}
+
+	if ( config.testNumber.length > 0 ) {
+		if ( inArray( test.testNumber, config.testNumber ) < 0 ) {
+			return false;
+		}
+	}
+
+	if ( module && ( !test.module || test.module.toLowerCase() !== module ) ) {
+		return false;
+	}
+
+	if ( !filter ) {
+		return true;
+	}
+
+	include = filter.charAt( 0 ) !== "!";
+	if ( !include ) {
+		filter = filter.slice( 1 );
+	}
+
+	// If the filter matches, we need to honour include
+	if ( fullName.indexOf( filter ) !== -1 ) {
+		return include;
+	}
+
+	// Otherwise, do the opposite
+	return !include;
+}
+
+// so far supports only Firefox, Chrome and Opera (buggy), Safari (for real exceptions)
+// Later Safari and IE10 are supposed to support error.stack as well
+// See also https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error/Stack
+function extractStacktrace( e, offset ) {
+	offset = offset === undefined ? 3 : offset;
+
+	var stack, include, i;
+
+	if ( e.stacktrace ) {
+		// Opera
+		return e.stacktrace.split( "\n" )[ offset + 3 ];
+	} else if ( e.stack ) {
+		// Firefox, Chrome
+		stack = e.stack.split( "\n" );
+		if (/^error$/i.test( stack[0] ) ) {
+			stack.shift();
+		}
+		if ( fileName ) {
+			include = [];
+			for ( i = offset; i < stack.length; i++ ) {
+				if ( stack[ i ].indexOf( fileName ) !== -1 ) {
+					break;
+				}
+				include.push( stack[ i ] );
+			}
+			if ( include.length ) {
+				return include.join( "\n" );
+			}
+		}
+		return stack[ offset ];
+	} else if ( e.sourceURL ) {
+		// Safari, PhantomJS
+		// hopefully one day Safari provides actual stacktraces
+		// exclude useless self-reference for generated Error objects
+		if ( /qunit.js$/.test( e.sourceURL ) ) {
+			return;
+		}
+		// for actual exceptions, this is useful
+		return e.sourceURL + ":" + e.line;
+	}
+}
+function sourceFromStacktrace( offset ) {
+	try {
+		throw new Error();
+	} catch ( e ) {
+		return extractStacktrace( e, offset );
+	}
+}
+
+/**
+ * Escape text for attribute or text content.
+ */
+function escapeText( s ) {
+	if ( !s ) {
+		return "";
+	}
+	s = s + "";
+	// Both single quotes and double quotes (for attributes)
+	return s.replace( /['"<>&]/g, function( s ) {
+		switch( s ) {
+			case "'":
+				return "&#039;";
+			case "\"":
+				return "&quot;";
+			case "<":
+				return "&lt;";
+			case ">":
+				return "&gt;";
+			case "&":
+				return "&amp;";
+		}
+	});
+}
+
+function synchronize( callback, last ) {
+	config.queue.push( callback );
+
+	if ( config.autorun && !config.blocking ) {
+		process( last );
+	}
+}
+
+function process( last ) {
+	function next() {
+		process( last );
+	}
+	var start = new Date().getTime();
+	config.depth = config.depth ? config.depth + 1 : 1;
+
+	while ( config.queue.length && !config.blocking ) {
+		if ( !defined.setTimeout || config.updateRate <= 0 || ( ( new Date().getTime() - start ) < config.updateRate ) ) {
+			config.queue.shift()();
+		} else {
+			setTimeout( next, 13 );
+			break;
+		}
+	}
+	config.depth--;
+	if ( last && !config.blocking && !config.queue.length && config.depth === 0 ) {
+		done();
+	}
+}
+
+function saveGlobal() {
+	config.pollution = [];
+
+	if ( config.noglobals ) {
+		for ( var key in window ) {
+			if ( hasOwn.call( window, key ) ) {
+				// in Opera sometimes DOM element ids show up here, ignore them
+				if ( /^qunit-test-output/.test( key ) ) {
+					continue;
+				}
+				config.pollution.push( key );
+			}
+		}
+	}
+}
+
+function checkPollution() {
+	var newGlobals,
+		deletedGlobals,
+		old = config.pollution;
+
+	saveGlobal();
+
+	newGlobals = diff( config.pollution, old );
+	if ( newGlobals.length > 0 ) {
+		QUnit.pushFailure( "Introduced global variable(s): " + newGlobals.join(", ") );
+	}
+
+	deletedGlobals = diff( old, config.pollution );
+	if ( deletedGlobals.length > 0 ) {
+		QUnit.pushFailure( "Deleted global variable(s): " + deletedGlobals.join(", ") );
+	}
+}
+
+// returns a new Array with the elements that are in a but not in b
+function diff( a, b ) {
+	var i, j,
+		result = a.slice();
+
+	for ( i = 0; i < result.length; i++ ) {
+		for ( j = 0; j < b.length; j++ ) {
+			if ( result[i] === b[j] ) {
+				result.splice( i, 1 );
+				i--;
+				break;
+			}
+		}
+	}
+	return result;
+}
+
+function extend( a, b ) {
+	for ( var prop in b ) {
+		if ( hasOwn.call( b, prop ) ) {
+			// Avoid "Member not found" error in IE8 caused by messing with window.constructor
+			if ( !( prop === "constructor" && a === window ) ) {
+				if ( b[ prop ] === undefined ) {
+					delete a[ prop ];
+				} else {
+					a[ prop ] = b[ prop ];
+				}
+			}
+		}
+	}
+
+	return a;
+}
+
+/**
+ * @param {HTMLElement} elem
+ * @param {string} type
+ * @param {Function} fn
+ */
+function addEvent( elem, type, fn ) {
+	if ( elem.addEventListener ) {
+
+		// Standards-based browsers
+		elem.addEventListener( type, fn, false );
+	} else if ( elem.attachEvent ) {
+
+		// support: IE <9
+		elem.attachEvent( "on" + type, fn );
+	} else {
+
+		// Caller must ensure support for event listeners is present
+		throw new Error( "addEvent() was called in a context without event listener support" );
+	}
+}
+
+/**
+ * @param {Array|NodeList} elems
+ * @param {string} type
+ * @param {Function} fn
+ */
+function addEvents( elems, type, fn ) {
+	var i = elems.length;
+	while ( i-- ) {
+		addEvent( elems[i], type, fn );
+	}
+}
+
+function hasClass( elem, name ) {
+	return (" " + elem.className + " ").indexOf(" " + name + " ") > -1;
+}
+
+function addClass( elem, name ) {
+	if ( !hasClass( elem, name ) ) {
+		elem.className += (elem.className ? " " : "") + name;
+	}
+}
+
+function removeClass( elem, name ) {
+	var set = " " + elem.className + " ";
+	// Class name may appear multiple times
+	while ( set.indexOf(" " + name + " ") > -1 ) {
+		set = set.replace(" " + name + " " , " ");
+	}
+	// If possible, trim it for prettiness, but not necessarily
+	elem.className = typeof set.trim === "function" ? set.trim() : set.replace(/^\s+|\s+$/g, "");
+}
+
+function id( name ) {
+	return defined.document && document.getElementById && document.getElementById( name );
+}
+
+function registerLoggingCallback( key ) {
+	return function( callback ) {
+		config[key].push( callback );
+	};
+}
+
+// Supports deprecated method of completely overwriting logging callbacks
+function runLoggingCallbacks( key, scope, args ) {
+	var i, callbacks;
+	if ( QUnit.hasOwnProperty( key ) ) {
+		QUnit[ key ].call(scope, args );
+	} else {
+		callbacks = config[ key ];
+		for ( i = 0; i < callbacks.length; i++ ) {
+			callbacks[ i ].call( scope, args );
+		}
+	}
+}
+
+// from jquery.js
+function inArray( elem, array ) {
+	if ( array.indexOf ) {
+		return array.indexOf( elem );
+	}
+
+	for ( var i = 0, length = array.length; i < length; i++ ) {
+		if ( array[ i ] === elem ) {
+			return i;
+		}
+	}
+
+	return -1;
+}
+
+function Test( settings ) {
+	extend( this, settings );
+	this.assertions = [];
+	this.testNumber = ++Test.count;
+}
+
+Test.count = 0;
+
+Test.prototype = {
+	init: function() {
+		var a, b, li,
+			tests = id( "qunit-tests" );
+
+		if ( tests ) {
+			b = document.createElement( "strong" );
+			b.innerHTML = this.nameHtml;
+
+			// `a` initialized at top of scope
+			a = document.createElement( "a" );
+			a.innerHTML = "Rerun";
+			a.href = QUnit.url({ testNumber: this.testNumber });
+
+			li = document.createElement( "li" );
+			li.appendChild( b );
+			li.appendChild( a );
+			li.className = "running";
+			li.id = this.id = "qunit-test-output" + testId++;
+
+			tests.appendChild( li );
+		}
+	},
+	setup: function() {
+		if (
+			// Emit moduleStart when we're switching from one module to another
+			this.module !== config.previousModule ||
+				// They could be equal (both undefined) but if the previousModule property doesn't
+				// yet exist it means this is the first test in a suite that isn't wrapped in a
+				// module, in which case we'll just emit a moduleStart event for 'undefined'.
+				// Without this, reporters can get testStart before moduleStart  which is a problem.
+				!hasOwn.call( config, "previousModule" )
+		) {
+			if ( hasOwn.call( config, "previousModule" ) ) {
+				runLoggingCallbacks( "moduleDone", QUnit, {
+					name: config.previousModule,
+					failed: config.moduleStats.bad,
+					passed: config.moduleStats.all - config.moduleStats.bad,
+					total: config.moduleStats.all
+				});
+			}
+			config.previousModule = this.module;
+			config.moduleStats = { all: 0, bad: 0 };
+			runLoggingCallbacks( "moduleStart", QUnit, {
+				name: this.module
+			});
+		}
+
+		config.current = this;
+
+		this.testEnvironment = extend({
+			setup: function() {},
+			teardown: function() {}
+		}, this.moduleTestEnvironment );
+
+		this.started = +new Date();
+		runLoggingCallbacks( "testStart", QUnit, {
+			name: this.testName,
+			module: this.module
+		});
+
+		/*jshint camelcase:false */
+
+
+		/**
+		 * Expose the current test environment.
+		 *
+		 * @deprecated since 1.12.0: Use QUnit.config.current.testEnvironment instead.
+		 */
+		QUnit.current_testEnvironment = this.testEnvironment;
+
+		/*jshint camelcase:true */
+
+		if ( !config.pollution ) {
+			saveGlobal();
+		}
+		if ( config.notrycatch ) {
+			this.testEnvironment.setup.call( this.testEnvironment, QUnit.assert );
+			return;
+		}
+		try {
+			this.testEnvironment.setup.call( this.testEnvironment, QUnit.assert );
+		} catch( e ) {
+			QUnit.pushFailure( "Setup failed on " + this.testName + ": " + ( e.message || e ), extractStacktrace( e, 1 ) );
+		}
+	},
+	run: function() {
+		config.current = this;
+
+		var running = id( "qunit-testresult" );
+
+		if ( running ) {
+			running.innerHTML = "Running: <br/>" + this.nameHtml;
+		}
+
+		if ( this.async ) {
+			QUnit.stop();
+		}
+
+		this.callbackStarted = +new Date();
+
+		if ( config.notrycatch ) {
+			this.callback.call( this.testEnvironment, QUnit.assert );
+			this.callbackRuntime = +new Date() - this.callbackStarted;
+			return;
+		}
+
+		try {
+			this.callback.call( this.testEnvironment, QUnit.assert );
+			this.callbackRuntime = +new Date() - this.callbackStarted;
+		} catch( e ) {
+			this.callbackRuntime = +new Date() - this.callbackStarted;
+
+			QUnit.pushFailure( "Died on test #" + (this.assertions.length + 1) + " " + this.stack + ": " + ( e.message || e ), extractStacktrace( e, 0 ) );
+			// else next test will carry the responsibility
+			saveGlobal();
+
+			// Restart the tests if they're blocking
+			if ( config.blocking ) {
+				QUnit.start();
+			}
+		}
+	},
+	teardown: function() {
+		config.current = this;
+		if ( config.notrycatch ) {
+			if ( typeof this.callbackRuntime === "undefined" ) {
+				this.callbackRuntime = +new Date() - this.callbackStarted;
+			}
+			this.testEnvironment.teardown.call( this.testEnvironment, QUnit.assert );
+			return;
+		} else {
+			try {
+				this.testEnvironment.teardown.call( this.testEnvironment, QUnit.assert );
+			} catch( e ) {
+				QUnit.pushFailure( "Teardown failed on " + this.testName + ": " + ( e.message || e ), extractStacktrace( e, 1 ) );
+			}
+		}
+		checkPollution();
+	},
+	finish: function() {
+		config.current = this;
+		if ( config.requireExpects && this.expected === null ) {
+			QUnit.pushFailure( "Expected number of assertions to be defined, but expect() was not called.", this.stack );
+		} else if ( this.expected !== null && this.expected !== this.assertions.length ) {
+			QUnit.pushFailure( "Expected " + this.expected + " assertions, but " + this.assertions.length + " were run", this.stack );
+		} else if ( this.expected === null && !this.assertions.length ) {
+			QUnit.pushFailure( "Expected at least one assertion, but none were run - call expect(0) to accept zero assertions.", this.stack );
+		}
+
+		var i, assertion, a, b, time, li, ol,
+			test = this,
+			good = 0,
+			bad = 0,
+			tests = id( "qunit-tests" );
+
+		this.runtime = +new Date() - this.started;
+		config.stats.all += this.assertions.length;
+		config.moduleStats.all += this.assertions.length;
+
+		if ( tests ) {
+			ol = document.createElement( "ol" );
+			ol.className = "qunit-assert-list";
+
+			for ( i = 0; i < this.assertions.length; i++ ) {
+				assertion = this.assertions[i];
+
+				li = document.createElement( "li" );
+				li.className = assertion.result ? "pass" : "fail";
+				li.innerHTML = assertion.message || ( assertion.result ? "okay" : "failed" );
+				ol.appendChild( li );
+
+				if ( assertion.result ) {
+					good++;
+				} else {
+					bad++;
+					config.stats.bad++;
+					config.moduleStats.bad++;
+				}
+			}
+
+			// store result when possible
+			if ( QUnit.config.reorder && defined.sessionStorage ) {
+				if ( bad ) {
+					sessionStorage.setItem( "qunit-test-" + this.module + "-" + this.testName, bad );
+				} else {
+					sessionStorage.removeItem( "qunit-test-" + this.module + "-" + this.testName );
+				}
+			}
+
+			if ( bad === 0 ) {
+				addClass( ol, "qunit-collapsed" );
+			}
+
+			// `b` initialized at top of scope
+			b = document.createElement( "strong" );
+			b.innerHTML = this.nameHtml + " <b class='counts'>(<b class='failed'>" + bad + "</b>, <b class='passed'>" + good + "</b>, " + this.assertions.length + ")</b>";
+
+			addEvent(b, "click", function() {
+				var next = b.parentNode.lastChild,
+					collapsed = hasClass( next, "qunit-collapsed" );
+				( collapsed ? removeClass : addClass )( next, "qunit-collapsed" );
+			});
+
+			addEvent(b, "dblclick", function( e ) {
+				var target = e && e.target ? e.target : window.event.srcElement;
+				if ( target.nodeName.toLowerCase() === "span" || target.nodeName.toLowerCase() === "b" ) {
+					target = target.parentNode;
+				}
+				if ( window.location && target.nodeName.toLowerCase() === "strong" ) {
+					window.location = QUnit.url({ testNumber: test.testNumber });
+				}
+			});
+
+			// `time` initialized at top of scope
+			time = document.createElement( "span" );
+			time.className = "runtime";
+			time.innerHTML = this.runtime + " ms";
+
+			// `li` initialized at top of scope
+			li = id( this.id );
+			li.className = bad ? "fail" : "pass";
+			li.removeChild( li.firstChild );
+			a = li.firstChild;
+			li.appendChild( b );
+			li.appendChild( a );
+			li.appendChild( time );
+			li.appendChild( ol );
+
+		} else {
+			for ( i = 0; i < this.assertions.length; i++ ) {
+				if ( !this.assertions[i].result ) {
+					bad++;
+					config.stats.bad++;
+					config.moduleStats.bad++;
+				}
+			}
+		}
+
+		runLoggingCallbacks( "testDone", QUnit, {
+			name: this.testName,
+			module: this.module,
+			failed: bad,
+			passed: this.assertions.length - bad,
+			total: this.assertions.length,
+			runtime: this.runtime,
+			// DEPRECATED: this property will be removed in 2.0.0, use runtime instead
+			duration: this.runtime
+		});
+
+		QUnit.reset();
+
+		config.current = undefined;
+	},
+
+	queue: function() {
+		var bad,
+			test = this;
+
+		synchronize(function() {
+			test.init();
+		});
+		function run() {
+			// each of these can by async
+			synchronize(function() {
+				test.setup();
+			});
+			synchronize(function() {
+				test.run();
+			});
+			synchronize(function() {
+				test.teardown();
+			});
+			synchronize(function() {
+				test.finish();
+			});
+		}
+
+		// `bad` initialized at top of scope
+		// defer when previous test run passed, if storage is available
+		bad = QUnit.config.reorder && defined.sessionStorage &&
+						+sessionStorage.getItem( "qunit-test-" + this.module + "-" + this.testName );
+
+		if ( bad ) {
+			run();
+		} else {
+			synchronize( run, true );
+		}
+	}
+};
+
+// `assert` initialized at top of scope
+// Assert helpers
+// All of these must either call QUnit.push() or manually do:
+// - runLoggingCallbacks( "log", .. );
+// - config.current.assertions.push({ .. });
+assert = QUnit.assert = {
+	/**
+	 * Asserts rough true-ish result.
+	 * @name ok
+	 * @function
+	 * @example ok( "asdfasdf".length > 5, "There must be at least 5 chars" );
+	 */
+	ok: function( result, msg ) {
+		if ( !config.current ) {
+			throw new Error( "ok() assertion outside test context, was " + sourceFromStacktrace(2) );
+		}
+		result = !!result;
+		msg = msg || ( result ? "okay" : "failed" );
+
+		var source,
+			details = {
+				module: config.current.module,
+				name: config.current.testName,
+				result: result,
+				message: msg
+			};
+
+		msg = "<span class='test-message'>" + escapeText( msg ) + "</span>";
+
+		if ( !result ) {
+			source = sourceFromStacktrace( 2 );
+			if ( source ) {
+				details.source = source;
+				msg += "<table><tr class='test-source'><th>Source: </th><td><pre>" +
+					escapeText( source ) +
+					"</pre></td></tr></table>";
+			}
+		}
+		runLoggingCallbacks( "log", QUnit, details );
+		config.current.assertions.push({
+			result: result,
+			message: msg
+		});
+	},
+
+	/**
+	 * Assert that the first two arguments are equal, with an optional message.
+	 * Prints out both actual and expected values.
+	 * @name equal
+	 * @function
+	 * @example equal( format( "Received {0} bytes.", 2), "Received 2 bytes.", "format() replaces {0} with next argument" );
+	 */
+	equal: function( actual, expected, message ) {
+		/*jshint eqeqeq:false */
+		QUnit.push( expected == actual, actual, expected, message );
+	},
+
+	/**
+	 * @name notEqual
+	 * @function
+	 */
+	notEqual: function( actual, expected, message ) {
+		/*jshint eqeqeq:false */
+		QUnit.push( expected != actual, actual, expected, message );
+	},
+
+	/**
+	 * @name propEqual
+	 * @function
+	 */
+	propEqual: function( actual, expected, message ) {
+		actual = objectValues(actual);
+		expected = objectValues(expected);
+		QUnit.push( QUnit.equiv(actual, expected), actual, expected, message );
+	},
+
+	/**
+	 * @name notPropEqual
+	 * @function
+	 */
+	notPropEqual: function( actual, expected, message ) {
+		actual = objectValues(actual);
+		expected = objectValues(expected);
+		QUnit.push( !QUnit.equiv(actual, expected), actual, expected, message );
+	},
+
+	/**
+	 * @name deepEqual
+	 * @function
+	 */
+	deepEqual: function( actual, expected, message ) {
+		QUnit.push( QUnit.equiv(actual, expected), actual, expected, message );
+	},
+
+	/**
+	 * @name notDeepEqual
+	 * @function
+	 */
+	notDeepEqual: function( actual, expected, message ) {
+		QUnit.push( !QUnit.equiv(actual, expected), actual, expected, message );
+	},
+
+	/**
+	 * @name strictEqual
+	 * @function
+	 */
+	strictEqual: function( actual, expected, message ) {
+		QUnit.push( expected === actual, actual, expected, message );
+	},
+
+	/**
+	 * @name notStrictEqual
+	 * @function
+	 */
+	notStrictEqual: function( actual, expected, message ) {
+		QUnit.push( expected !== actual, actual, expected, message );
+	},
+
+	"throws": function( block, expected, message ) {
+		var actual,
+			expectedOutput = expected,
+			ok = false;
+
+		// 'expected' is optional
+		if ( !message && typeof expected === "string" ) {
+			message = expected;
+			expected = null;
+		}
+
+		config.current.ignoreGlobalErrors = true;
+		try {
+			block.call( config.current.testEnvironment );
+		} catch (e) {
+			actual = e;
+		}
+		config.current.ignoreGlobalErrors = false;
+
+		if ( actual ) {
+
+			// we don't want to validate thrown error
+			if ( !expected ) {
+				ok = true;
+				expectedOutput = null;
+
+			// expected is an Error object
+			} else if ( expected instanceof Error ) {
+				ok = actual instanceof Error &&
+					 actual.name === expected.name &&
+					 actual.message === expected.message;
+
+			// expected is a regexp
+			} else if ( QUnit.objectType( expected ) === "regexp" ) {
+				ok = expected.test( errorString( actual ) );
+
+			// expected is a string
+			} else if ( QUnit.objectType( expected ) === "string" ) {
+				ok = expected === errorString( actual );
+
+			// expected is a constructor
+			} else if ( actual instanceof expected ) {
+				ok = true;
+
+			// expected is a validation function which returns true is validation passed
+			} else if ( expected.call( {}, actual ) === true ) {
+				expectedOutput = null;
+				ok = true;
+			}
+
+			QUnit.push( ok, actual, expectedOutput, message );
+		} else {
+			QUnit.pushFailure( message, null, "No exception was thrown." );
+		}
+	}
+};
+
+/**
+ * @deprecated since 1.8.0
+ * Kept assertion helpers in root for backwards compatibility.
+ */
+extend( QUnit.constructor.prototype, assert );
+
+/**
+ * @deprecated since 1.9.0
+ * Kept to avoid TypeErrors for undefined methods.
+ */
+QUnit.constructor.prototype.raises = function() {
+	QUnit.push( false, false, false, "QUnit.raises has been deprecated since 2012 (fad3c1ea), use QUnit.throws instead" );
+};
+
+/**
+ * @deprecated since 1.0.0, replaced with error pushes since 1.3.0
+ * Kept to avoid TypeErrors for undefined methods.
+ */
+QUnit.constructor.prototype.equals = function() {
+	QUnit.push( false, false, false, "QUnit.equals has been deprecated since 2009 (e88049a0), use QUnit.equal instead" );
+};
+QUnit.constructor.prototype.same = function() {
+	QUnit.push( false, false, false, "QUnit.same has been deprecated since 2009 (e88049a0), use QUnit.deepEqual instead" );
+};
+
+// Test for equality any JavaScript type.
+// Author: Philippe Rathé <prathe@gmail.com>
+QUnit.equiv = (function() {
+
+	// Call the o related callback with the given arguments.
+	function bindCallbacks( o, callbacks, args ) {
+		var prop = QUnit.objectType( o );
+		if ( prop ) {
+			if ( QUnit.objectType( callbacks[ prop ] ) === "function" ) {
+				return callbacks[ prop ].apply( callbacks, args );
+			} else {
+				return callbacks[ prop ]; // or undefined
+			}
+		}
+	}
+
+	// the real equiv function
+	var innerEquiv,
+		// stack to decide between skip/abort functions
+		callers = [],
+		// stack to avoiding loops from circular referencing
+		parents = [],
+		parentsB = [],
+
+		getProto = Object.getPrototypeOf || function ( obj ) {
+			/*jshint camelcase:false */
+			return obj.__proto__;
+		},
+		callbacks = (function () {
+
+			// for string, boolean, number and null
+			function useStrictEquality( b, a ) {
+				/*jshint eqeqeq:false */
+				if ( b instanceof a.constructor || a instanceof b.constructor ) {
+					// to catch short annotation VS 'new' annotation of a
+					// declaration
+					// e.g. var i = 1;
+					// var j = new Number(1);
+					return a == b;
+				} else {
+					return a === b;
+				}
+			}
+
+			return {
+				"string": useStrictEquality,
+				"boolean": useStrictEquality,
+				"number": useStrictEquality,
+				"null": useStrictEquality,
+				"undefined": useStrictEquality,
+
+				"nan": function( b ) {
+					return isNaN( b );
+				},
+
+				"date": function( b, a ) {
+					return QUnit.objectType( b ) === "date" && a.valueOf() === b.valueOf();
+				},
+
+				"regexp": function( b, a ) {
+					return QUnit.objectType( b ) === "regexp" &&
+						// the regex itself
+						a.source === b.source &&
+						// and its modifiers
+						a.global === b.global &&
+						// (gmi) ...
+						a.ignoreCase === b.ignoreCase &&
+						a.multiline === b.multiline &&
+						a.sticky === b.sticky;
+				},
+
+				// - skip when the property is a method of an instance (OOP)
+				// - abort otherwise,
+				// initial === would have catch identical references anyway
+				"function": function() {
+					var caller = callers[callers.length - 1];
+					return caller !== Object && typeof caller !== "undefined";
+				},
+
+				"array": function( b, a ) {
+					var i, j, len, loop, aCircular, bCircular;
+
+					// b could be an object literal here
+					if ( QUnit.objectType( b ) !== "array" ) {
+						return false;
+					}
+
+					len = a.length;
+					if ( len !== b.length ) {
+						// safe and faster
+						return false;
+					}
+
+					// track reference to avoid circular references
+					parents.push( a );
+					parentsB.push( b );
+					for ( i = 0; i < len; i++ ) {
+						loop = false;
+						for ( j = 0; j < parents.length; j++ ) {
+							aCircular = parents[j] === a[i];
+							bCircular = parentsB[j] === b[i];
+							if ( aCircular || bCircular ) {
+								if ( a[i] === b[i] || aCircular && bCircular ) {
+									loop = true;
+								} else {
+									parents.pop();
+									parentsB.pop();
+									return false;
+								}
+							}
+						}
+						if ( !loop && !innerEquiv(a[i], b[i]) ) {
+							parents.pop();
+							parentsB.pop();
+							return false;
+						}
+					}
+					parents.pop();
+					parentsB.pop();
+					return true;
+				},
+
+				"object": function( b, a ) {
+					/*jshint forin:false */
+					var i, j, loop, aCircular, bCircular,
+						// Default to true
+						eq = true,
+						aProperties = [],
+						bProperties = [];
+
+					// comparing constructors is more strict than using
+					// instanceof
+					if ( a.constructor !== b.constructor ) {
+						// Allow objects with no prototype to be equivalent to
+						// objects with Object as their constructor.
+						if ( !(( getProto(a) === null && getProto(b) === Object.prototype ) ||
+							( getProto(b) === null && getProto(a) === Object.prototype ) ) ) {
+								return false;
+						}
+					}
+
+					// stack constructor before traversing properties
+					callers.push( a.constructor );
+
+					// track reference to avoid circular references
+					parents.push( a );
+					parentsB.push( b );
+
+					// be strict: don't ensure hasOwnProperty and go deep
+					for ( i in a ) {
+						loop = false;
+						for ( j = 0; j < parents.length; j++ ) {
+							aCircular = parents[j] === a[i];
+							bCircular = parentsB[j] === b[i];
+							if ( aCircular || bCircular ) {
+								if ( a[i] === b[i] || aCircular && bCircular ) {
+									loop = true;
+								} else {
+									eq = false;
+									break;
+								}
+							}
+						}
+						aProperties.push(i);
+						if ( !loop && !innerEquiv(a[i], b[i]) ) {
+							eq = false;
+							break;
+						}
+					}
+
+					parents.pop();
+					parentsB.pop();
+					callers.pop(); // unstack, we are done
+
+					for ( i in b ) {
+						bProperties.push( i ); // collect b's properties
+					}
+
+					// Ensures identical properties name
+					return eq && innerEquiv( aProperties.sort(), bProperties.sort() );
+				}
+			};
+		}());
+
+	innerEquiv = function() { // can take multiple arguments
+		var args = [].slice.apply( arguments );
+		if ( args.length < 2 ) {
+			return true; // end transition
+		}
+
+		return (function( a, b ) {
+			if ( a === b ) {
+				return true; // catch the most you can
+			} else if ( a === null || b === null || typeof a === "undefined" ||
+					typeof b === "undefined" ||
+					QUnit.objectType(a) !== QUnit.objectType(b) ) {
+				return false; // don't lose time with error prone cases
+			} else {
+				return bindCallbacks(a, callbacks, [ b, a ]);
+			}
+
+			// apply transition with (1..n) arguments
+		}( args[0], args[1] ) && innerEquiv.apply( this, args.splice(1, args.length - 1 )) );
+	};
+
+	return innerEquiv;
+}());
+
+/**
+ * jsDump Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com |
+ * http://flesler.blogspot.com Licensed under BSD
+ * (http://www.opensource.org/licenses/bsd-license.php) Date: 5/15/2008
+ *
+ * @projectDescription Advanced and extensible data dumping for Javascript.
+ * @version 1.0.0
+ * @author Ariel Flesler
+ * @link {http://flesler.blogspot.com/2008/05/jsdump-pretty-dump-of-any-javascript.html}
+ */
+QUnit.jsDump = (function() {
+	function quote( str ) {
+		return "\"" + str.toString().replace( /"/g, "\\\"" ) + "\"";
+	}
+	function literal( o ) {
+		return o + "";
+	}
+	function join( pre, arr, post ) {
+		var s = jsDump.separator(),
+			base = jsDump.indent(),
+			inner = jsDump.indent(1);
+		if ( arr.join ) {
+			arr = arr.join( "," + s + inner );
+		}
+		if ( !arr ) {
+			return pre + post;
+		}
+		return [ pre, inner + arr, base + post ].join(s);
+	}
+	function array( arr, stack ) {
+		var i = arr.length, ret = new Array(i);
+		this.up();
+		while ( i-- ) {
+			ret[i] = this.parse( arr[i] , undefined , stack);
+		}
+		this.down();
+		return join( "[", ret, "]" );
+	}
+
+	var reName = /^function (\w+)/,
+		jsDump = {
+			// type is used mostly internally, you can fix a (custom)type in advance
+			parse: function( obj, type, stack ) {
+				stack = stack || [ ];
+				var inStack, res,
+					parser = this.parsers[ type || this.typeOf(obj) ];
+
+				type = typeof parser;
+				inStack = inArray( obj, stack );
+
+				if ( inStack !== -1 ) {
+					return "recursion(" + (inStack - stack.length) + ")";
+				}
+				if ( type === "function" )  {
+					stack.push( obj );
+					res = parser.call( this, obj, stack );
+					stack.pop();
+					return res;
+				}
+				return ( type === "string" ) ? parser : this.parsers.error;
+			},
+			typeOf: function( obj ) {
+				var type;
+				if ( obj === null ) {
+					type = "null";
+				} else if ( typeof obj === "undefined" ) {
+					type = "undefined";
+				} else if ( QUnit.is( "regexp", obj) ) {
+					type = "regexp";
+				} else if ( QUnit.is( "date", obj) ) {
+					type = "date";
+				} else if ( QUnit.is( "function", obj) ) {
+					type = "function";
+				} else if ( typeof obj.setInterval !== undefined && typeof obj.document !== "undefined" && typeof obj.nodeType === "undefined" ) {
+					type = "window";
+				} else if ( obj.nodeType === 9 ) {
+					type = "document";
+				} else if ( obj.nodeType ) {
+					type = "node";
+				} else if (
+					// native arrays
+					toString.call( obj ) === "[object Array]" ||
+					// NodeList objects
+					( typeof obj.length === "number" && typeof obj.item !== "undefined" && ( obj.length ? obj.item(0) === obj[0] : ( obj.item( 0 ) === null && typeof obj[0] === "undefined" ) ) )
+				) {
+					type = "array";
+				} else if ( obj.constructor === Error.prototype.constructor ) {
+					type = "error";
+				} else {
+					type = typeof obj;
+				}
+				return type;
+			},
+			separator: function() {
+				return this.multiline ?	this.HTML ? "<br />" : "\n" : this.HTML ? "&nbsp;" : " ";
+			},
+			// extra can be a number, shortcut for increasing-calling-decreasing
+			indent: function( extra ) {
+				if ( !this.multiline ) {
+					return "";
+				}
+				var chr = this.indentChar;
+				if ( this.HTML ) {
+					chr = chr.replace( /\t/g, "   " ).replace( / /g, "&nbsp;" );
+				}
+				return new Array( this.depth + ( extra || 0 ) ).join(chr);
+			},
+			up: function( a ) {
+				this.depth += a || 1;
+			},
+			down: function( a ) {
+				this.depth -= a || 1;
+			},
+			setParser: function( name, parser ) {
+				this.parsers[name] = parser;
+			},
+			// The next 3 are exposed so you can use them
+			quote: quote,
+			literal: literal,
+			join: join,
+			//
+			depth: 1,
+			// This is the list of parsers, to modify them, use jsDump.setParser
+			parsers: {
+				window: "[Window]",
+				document: "[Document]",
+				error: function(error) {
+					return "Error(\"" + error.message + "\")";
+				},
+				unknown: "[Unknown]",
+				"null": "null",
+				"undefined": "undefined",
+				"function": function( fn ) {
+					var ret = "function",
+						// functions never have name in IE
+						name = "name" in fn ? fn.name : (reName.exec(fn) || [])[1];
+
+					if ( name ) {
+						ret += " " + name;
+					}
+					ret += "( ";
+
+					ret = [ ret, QUnit.jsDump.parse( fn, "functionArgs" ), "){" ].join( "" );
+					return join( ret, QUnit.jsDump.parse(fn,"functionCode" ), "}" );
+				},
+				array: array,
+				nodelist: array,
+				"arguments": array,
+				object: function( map, stack ) {
+					/*jshint forin:false */
+					var ret = [ ], keys, key, val, i;
+					QUnit.jsDump.up();
+					keys = [];
+					for ( key in map ) {
+						keys.push( key );
+					}
+					keys.sort();
+					for ( i = 0; i < keys.length; i++ ) {
+						key = keys[ i ];
+						val = map[ key ];
+						ret.push( QUnit.jsDump.parse( key, "key" ) + ": " + QUnit.jsDump.parse( val, undefined, stack ) );
+					}
+					QUnit.jsDump.down();
+					return join( "{", ret, "}" );
+				},
+				node: function( node ) {
+					var len, i, val,
+						open = QUnit.jsDump.HTML ? "&lt;" : "<",
+						close = QUnit.jsDump.HTML ? "&gt;" : ">",
+						tag = node.nodeName.toLowerCase(),
+						ret = open + tag,
+						attrs = node.attributes;
+
+					if ( attrs ) {
+						for ( i = 0, len = attrs.length; i < len; i++ ) {
+							val = attrs[i].nodeValue;
+							// IE6 includes all attributes in .attributes, even ones not explicitly set.
+							// Those have values like undefined, null, 0, false, "" or "inherit".
+							if ( val && val !== "inherit" ) {
+								ret += " " + attrs[i].nodeName + "=" + QUnit.jsDump.parse( val, "attribute" );
+							}
+						}
+					}
+					ret += close;
+
+					// Show content of TextNode or CDATASection
+					if ( node.nodeType === 3 || node.nodeType === 4 ) {
+						ret += node.nodeValue;
+					}
+
+					return ret + open + "/" + tag + close;
+				},
+				// function calls it internally, it's the arguments part of the function
+				functionArgs: function( fn ) {
+					var args,
+						l = fn.length;
+
+					if ( !l ) {
+						return "";
+					}
+
+					args = new Array(l);
+					while ( l-- ) {
+						// 97 is 'a'
+						args[l] = String.fromCharCode(97+l);
+					}
+					return " " + args.join( ", " ) + " ";
+				},
+				// object calls it internally, the key part of an item in a map
+				key: quote,
+				// function calls it internally, it's the content of the function
+				functionCode: "[code]",
+				// node calls it internally, it's an html attribute value
+				attribute: quote,
+				string: quote,
+				date: quote,
+				regexp: literal,
+				number: literal,
+				"boolean": literal
+			},
+			// if true, entities are escaped ( <, >, \t, space and \n )
+			HTML: false,
+			// indentation unit
+			indentChar: "  ",
+			// if true, items in a collection, are separated by a \n, else just a space.
+			multiline: true
+		};
+
+	return jsDump;
+}());
+
+/*
+ * Javascript Diff Algorithm
+ *  By John Resig (http://ejohn.org/)
+ *  Modified by Chu Alan "sprite"
+ *
+ * Released under the MIT license.
+ *
+ * More Info:
+ *  http://ejohn.org/projects/javascript-diff-algorithm/
+ *
+ * Usage: QUnit.diff(expected, actual)
+ *
+ * QUnit.diff( "the quick brown fox jumped over", "the quick fox jumps over" ) == "the  quick <del>brown </del> fox <del>jumped </del><ins>jumps </ins> over"
+ */
+QUnit.diff = (function() {
+	/*jshint eqeqeq:false, eqnull:true */
+	function diff( o, n ) {
+		var i,
+			ns = {},
+			os = {};
+
+		for ( i = 0; i < n.length; i++ ) {
+			if ( !hasOwn.call( ns, n[i] ) ) {
+				ns[ n[i] ] = {
+					rows: [],
+					o: null
+				};
+			}
+			ns[ n[i] ].rows.push( i );
+		}
+
+		for ( i = 0; i < o.length; i++ ) {
+			if ( !hasOwn.call( os, o[i] ) ) {
+				os[ o[i] ] = {
+					rows: [],
+					n: null
+				};
+			}
+			os[ o[i] ].rows.push( i );
+		}
+
+		for ( i in ns ) {
+			if ( hasOwn.call( ns, i ) ) {
+				if ( ns[i].rows.length === 1 && hasOwn.call( os, i ) && os[i].rows.length === 1 ) {
+					n[ ns[i].rows[0] ] = {
+						text: n[ ns[i].rows[0] ],
+						row: os[i].rows[0]
+					};
+					o[ os[i].rows[0] ] = {
+						text: o[ os[i].rows[0] ],
+						row: ns[i].rows[0]
+					};
+				}
+			}
+		}
+
+		for ( i = 0; i < n.length - 1; i++ ) {
+			if ( n[i].text != null && n[ i + 1 ].text == null && n[i].row + 1 < o.length && o[ n[i].row + 1 ].text == null &&
+						n[ i + 1 ] == o[ n[i].row + 1 ] ) {
+
+				n[ i + 1 ] = {
+					text: n[ i + 1 ],
+					row: n[i].row + 1
+				};
+				o[ n[i].row + 1 ] = {
+					text: o[ n[i].row + 1 ],
+					row: i + 1
+				};
+			}
+		}
+
+		for ( i = n.length - 1; i > 0; i-- ) {
+			if ( n[i].text != null && n[ i - 1 ].text == null && n[i].row > 0 && o[ n[i].row - 1 ].text == null &&
+						n[ i - 1 ] == o[ n[i].row - 1 ]) {
+
+				n[ i - 1 ] = {
+					text: n[ i - 1 ],
+					row: n[i].row - 1
+				};
+				o[ n[i].row - 1 ] = {
+					text: o[ n[i].row - 1 ],
+					row: i - 1
+				};
+			}
+		}
+
+		return {
+			o: o,
+			n: n
+		};
+	}
+
+	return function( o, n ) {
+		o = o.replace( /\s+$/, "" );
+		n = n.replace( /\s+$/, "" );
+
+		var i, pre,
+			str = "",
+			out = diff( o === "" ? [] : o.split(/\s+/), n === "" ? [] : n.split(/\s+/) ),
+			oSpace = o.match(/\s+/g),
+			nSpace = n.match(/\s+/g);
+
+		if ( oSpace == null ) {
+			oSpace = [ " " ];
+		}
+		else {
+			oSpace.push( " " );
+		}
+
+		if ( nSpace == null ) {
+			nSpace = [ " " ];
+		}
+		else {
+			nSpace.push( " " );
+		}
+
+		if ( out.n.length === 0 ) {
+			for ( i = 0; i < out.o.length; i++ ) {
+				str += "<del>" + out.o[i] + oSpace[i] + "</del>";
+			}
+		}
+		else {
+			if ( out.n[0].text == null ) {
+				for ( n = 0; n < out.o.length && out.o[n].text == null; n++ ) {
+					str += "<del>" + out.o[n] + oSpace[n] + "</del>";
+				}
+			}
+
+			for ( i = 0; i < out.n.length; i++ ) {
+				if (out.n[i].text == null) {
+					str += "<ins>" + out.n[i] + nSpace[i] + "</ins>";
+				}
+				else {
+					// `pre` initialized at top of scope
+					pre = "";
+
+					for ( n = out.n[i].row + 1; n < out.o.length && out.o[n].text == null; n++ ) {
+						pre += "<del>" + out.o[n] + oSpace[n] + "</del>";
+					}
+					str += " " + out.n[i].text + nSpace[i] + pre;
+				}
+			}
+		}
+
+		return str;
+	};
+}());
+
+// For browser, export only select globals
+if ( typeof window !== "undefined" ) {
+	extend( window, QUnit.constructor.prototype );
+	window.QUnit = QUnit;
+}
+
+// For CommonJS environments, export everything
+if ( typeof module !== "undefined" && module.exports ) {
+	module.exports = QUnit;
+}
+
+
+// Get a reference to the global object, like window in browsers
+}( (function() {
+	return this;
+})() ));
diff --git a/actionview/test/ujs/server.rb b/actionview/test/ujs/server.rb
new file mode 100644
index 0000000000..c7698c87fa
--- /dev/null
+++ b/actionview/test/ujs/server.rb
@@ -0,0 +1,105 @@
+require "rails"
+require "action_controller/railtie"
+require "action_view/railtie"
+require "blade"
+require "json"
+
+JQUERY_VERSIONS = %w[ 1.8.0 1.8.1 1.8.2 1.8.3 1.9.0 1.9.1 1.10.0 1.10.1 1.10.2 1.11.0 2.0.0 2.1.0].freeze
+
+module UJS
+  class Server < Rails::Application
+    routes.append do
+      get "/rails-ujs.js" => Blade::Assets.environment
+      get "/" => "tests#index"
+      match "/echo" => "tests#echo", via: :all
+      get "/error" => proc {|env| [403, {}, []] }
+    end
+
+    config.cache_classes = false
+    config.eager_load = false
+    config.secret_key_base = "59d7a4dbd349fa3838d79e330e39690fc22b931e7dc17d9162f03d633d526fbb92dfdb2dc9804c8be3e199631b9c1fbe43fc3e4fc75730b515851849c728d5c7"
+    config.paths["app/views"].unshift("#{Rails.root / "views"}")
+    config.public_file_server.enabled = true
+    config.logger = Logger.new(STDOUT)
+    config.log_level = :error
+  end
+end
+
+module TestsHelper
+  def jquery_link version
+    if params[:version] == version
+      "[#{version}]"
+    else
+      "<a href='/?version=#{version}&cdn=#{params[:cdn]}'>#{version}</a>".html_safe
+    end
+  end
+
+  def cdn_link cdn
+    if params[:cdn] == cdn
+      "[#{cdn}]"
+    else
+      "<a href='/?version=#{params[:version]}&cdn=#{cdn}'>#{cdn}</a>".html_safe
+    end
+  end
+
+  def jquery_src
+    if params[:version] == 'edge'
+      "/vendor/jquery.js"
+    elsif params[:cdn] && params[:cdn] == 'googleapis'
+      "https://ajax.googleapis.com/ajax/libs/jquery/#{params[:version]}/jquery.min.js"
+    else
+      "http://code.jquery.com/jquery-#{params[:version]}.js"
+    end
+  end
+
+  def test_to *names
+    names = ["/vendor/qunit.js", "settings"] + names
+    names.map { |name| script_tag name }.join("\n").html_safe
+  end
+
+  def script_tag src
+    src = "/test/#{src}.js" unless src.index('/')
+    %(<script src="#{src}" type="text/javascript"></script>).html_safe
+  end
+
+  def jquery_versions
+    JQUERY_VERSIONS
+  end
+end
+
+class TestsController < ActionController::Base
+  helper TestsHelper
+  layout "application"
+
+  def index
+    params[:version] ||= ENV['JQUERY_VERSION'] || '1.11.0'
+    params[:cdn] ||= 'jquery'
+    render :index
+  end
+
+  def echo
+    data = { :params => params.to_unsafe_h }.update(request.env)
+
+    if params[:content_type] and params[:content]
+      render inline: params[:content], content_type: params[:content_type]
+    elsif request.xhr?
+      render json: JSON.generate(data)
+    elsif params[:iframe]
+      payload = JSON.generate(data).gsub('<', '&lt;').gsub('>', '&gt;')
+      html = <<-HTML
+        <script>
+          if (window.top && window.top !== window)
+            window.top.jQuery.event.trigger('iframe:loaded', #{payload})
+        </script>
+        <p>You shouldn't be seeing this. <a href="#{request.env['HTTP_REFERER']}">Go back</a></p>
+      HTML
+
+      render html: html.html_safe
+    else
+      render text: "ERROR: #{request.path} requested without ajax", status: 404
+    end
+  end
+end
+
+Blade.initialize!
+UJS::Server.initialize!
diff --git a/actionview/test/ujs/views/layouts/application.html.erb b/actionview/test/ujs/views/layouts/application.html.erb
new file mode 100644
index 0000000000..74fa3bd06d
--- /dev/null
+++ b/actionview/test/ujs/views/layouts/application.html.erb
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html id="html">
+  <head>
+    <title><%= @title %></title>
+    <link href="/vendor/qunit.css" media="screen" rel="stylesheet" type="text/css" media="screen, projection" />
+    <style>
+      #jquery-cdn, #jquery-version {
+        padding: 0 2em .8em 0;
+        text-align: right;
+        font-family: sans-serif;
+        line-height: 1;
+        color: #8699A4;
+        background-color: #0d3349;
+      }
+      #jquery-cdn a, #jquery-version a {
+        color: white;
+        text-decoration: underline;
+      }
+    </style>
+
+    <%= script_tag jquery_src %>
+    <script>
+      // This is for test in override.js.
+      // Must go after jQuery is loaded, but before jquery-ujs.
+      $(document).bind('rails:attachBindings', function() {
+        $.rails.linkClickSelector += ', a[data-custom-remote-link]';
+        // Hijacks link click before ujs binds any handlers
+        // This is only used for ctrl-clicking test on remote links
+        $.rails.delegate(document, '#qunit-fixture a', 'click', function(e) {
+          e.preventDefault();
+        });
+      });
+    </script>
+    <%= script_tag "/rails-ujs.js" %>
+  </head>
+
+  <body id="body">
+    <%= yield %>
+  </body>
+</html>
diff --git a/actionview/test/ujs/views/tests/index.html.erb b/actionview/test/ujs/views/tests/index.html.erb
new file mode 100644
index 0000000000..393a5ee235
--- /dev/null
+++ b/actionview/test/ujs/views/tests/index.html.erb
@@ -0,0 +1,25 @@
+<% @title = "jquery-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' %>
+
+<h1 id="qunit-header"><%= @title %></h1>
+<div id="jquery-cdn">
+  CDN:
+  <%= cdn_link 'jquery' %> •
+  <%= cdn_link 'googleapis' %>
+</div>
+<div id="jquery-version">
+  jQuery version:
+
+  <% jquery_versions.each do |v| %>
+    <%= ' • ' if v != jquery_versions.first %>
+    <%= jquery_link v %>
+  <% end %>
+ <%= (' • ' + jquery_link('edge')) if File.exist?(Rails.root + '/public/vendor/jquery.js') %>
+</div>
+<h2 id="qunit-banner"></h2>
+<div id="qunit-testrunner-toolbar"></div>
+<h2 id="qunit-userAgent"></h2>
+<ol id="qunit-tests"></ol>
+
+<div id="qunit-fixture"></div>