From 840ab6ac76b2d5ab931841bc3d8567e5b57f183e Mon Sep 17 00:00:00 2001 From: Akzhan Abdulin Date: Fri, 2 Sep 2011 12:05:59 +0400 Subject: [PATCH] Add jQuery version 1.6.3 to tests, and use it by default --- test/server.rb | 8 +++++++- test/views/index.erb | 10 ++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/test/server.rb b/test/server.rb index 095eed0e..8a9bc259 100644 --- a/test/server.rb +++ b/test/server.rb @@ -1,6 +1,8 @@ require 'sinatra' require 'json' +JQUERY_VERSIONS = %w[ 1.6 1.6.1 1.6.2 1.6.3 ].freeze + use Rack::Static, :urls => ["/src"], :root => File.expand_path('..', settings.root) helpers do @@ -39,10 +41,14 @@ def script_tag src src = "/test/#{src}.js" unless src.index('/') %() end + + def jquery_versions + JQUERY_VERSIONS + end end get '/' do - params[:version] ||= '1.6.2' + params[:version] ||= JQUERY_VERSIONS.last params[:cdn] ||= 'jquery' erb :index end diff --git a/test/views/index.erb b/test/views/index.erb index 3ec4c6f2..21c7bc6c 100644 --- a/test/views/index.erb +++ b/test/views/index.erb @@ -10,10 +10,12 @@
jQuery version: - <%= jquery_link '1.6' %> • - <%= jquery_link '1.6.1' %> • - <%= jquery_link '1.6.2' %> • - <%= jquery_link 'edge' if File.exist?(settings.root + '/public/vendor/jquery.js') %> + + <% jquery_versions.each do |v| %> + <%= ' • ' if v != jquery_versions.first %> + <%= jquery_link v %> + <% end %> + <%= (' • ' + jquery_link('edge')) if File.exist?(settings.root + '/public/vendor/jquery.js') %>