4 files changed, 7 insertions, 68 deletions
diff --git a/actionview/test/ujs/config.ru b/actionview/test/ujs/config.ru
index 414c2063c3..48b7a4b53a 100644
--- a/actionview/test/ujs/config.ru
+++ b/actionview/test/ujs/config.ru
@@ -1,3 +1,4 @@
 $LOAD_PATH.unshift File.expand_path("..", __FILE__)
 require "server"
+
 run UJS::Server
diff --git a/actionview/test/ujs/server.rb b/actionview/test/ujs/server.rb
index 25f70baf5f..7deb208af0 100644
--- a/actionview/test/ujs/server.rb
+++ b/actionview/test/ujs/server.rb
@@ -1,11 +1,10 @@
+require "rack"
 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
@@ -18,7 +17,7 @@ module UJS
     config.cache_classes = false
     config.eager_load = false
     config.secret_key_base = "59d7a4dbd349fa3838d79e330e39690fc22b931e7dc17d9162f03d633d526fbb92dfdb2dc9804c8be3e199631b9c1fbe43fc3e4fc75730b515851849c728d5c7"
-    config.paths["app/views"].unshift("#{Rails.root / "views"}")
+    config.paths["app/views"].unshift("#{Rails.root}/views")
     config.public_file_server.enabled = true
     config.logger = Logger.new(STDOUT)
     config.log_level = :error
@@ -26,32 +25,6 @@ module UJS
 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
@@ -61,10 +34,6 @@ module TestsHelper
     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
@@ -72,8 +41,6 @@ class TestsController < ActionController::Base
   layout "application"
 
   def index
-    params[:version] ||= ENV["JQUERY_VERSION"] || "1.11.0"
-    params[:cdn] ||= "jquery"
     render :index
   end
 
diff --git a/actionview/test/ujs/views/layouts/application.html.erb b/actionview/test/ujs/views/layouts/application.html.erb
index e09b213b72..a69cd2d739 100644
--- a/actionview/test/ujs/views/layouts/application.html.erb
+++ b/actionview/test/ujs/views/layouts/application.html.erb
@@ -3,30 +3,15 @@
   <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_tag "http://code.jquery.com/jquery-2.2.0.js" %>
     <script>
       // This is for test in override.js.
       // Must go before rails-ujs.
-      $(document).bind('rails:attachBindings', function() {
-        $.rails.linkClickSelector += ', a[data-custom-remote-link]';
+      document.addEventListener('rails:attachBindings', function() {
+        window.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) {
+        window.Rails.delegate(document, '#qunit-fixture a', 'click', function(e) {
           e.preventDefault();
         });
       });
diff --git a/actionview/test/ujs/views/tests/index.html.erb b/actionview/test/ujs/views/tests/index.html.erb
index 2ac44eeb81..8de6cd0695 100644
--- a/actionview/test/ujs/views/tests/index.html.erb
+++ b/actionview/test/ujs/views/tests/index.html.erb
@@ -3,20 +3,6 @@
 <%= 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>