Move jQuery & QUnit to vendor/

JorgenHookham · Nov 21, 2014 · 716ec4b · 716ec4b
1 parent 464a478
commit 716ec4b
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 17 deletions.
diff --git a/bower.json b/bower.json
@@ -9,6 +9,7 @@
     ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
+    "vendor/",
     "test/"
   ]
 }
diff --git a/test/app.rb b/test/app.rb
@@ -1,7 +1,7 @@
 require 'sinatra'
 require 'json'
 
-set :public_folder, settings.root
+set :public_folder, File.dirname(settings.root)
 enable :static
 
 helpers do
@@ -31,14 +31,6 @@ def title(str)
   erb :qunit
 end
 
-get '/jquery.pjax.js' do
-  send_file "#{settings.root}/../jquery.pjax.js"
-end
-
-get '/test/:file' do
-  send_file "#{settings.root}/../test/#{params[:file]}"
-end
-
 get '/env.html' do
   erb :env, :layout => !pjax?
 end

diff --git a/test/views/layout.erb b/test/views/layout.erb
@@ -3,8 +3,8 @@
 <head>
   <meta charset="utf-8">
   <title><%= @title %></title>
-  <script type="text/javascript" src="test/jquery-1.9.0.js"></script>
-  <script type="text/javascript" src="jquery.pjax.js"></script>
+  <script type="text/javascript" src="/vendor/jquery.js"></script>
+  <script type="text/javascript" src="/jquery.pjax.js"></script>
 </head>
 <body>
   <div id="main">

diff --git a/test/views/qunit.erb b/test/views/qunit.erb
@@ -2,15 +2,15 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <link rel="stylesheet" href="/test/qunit.css">
+  <link rel="stylesheet" href="/vendor/qunit.css">
 
-  <script type="text/javascript" src="/test/jquery-1.9.0.js"></script>
-  <script type="text/javascript" src="/test/qunit.js"></script>
+  <script type="text/javascript" src="/vendor/jquery.js"></script>
+  <script type="text/javascript" src="/vendor/qunit.js"></script>
   <script type="text/javascript">QUnit.config.testTimeout = 10000</script>
   <script type="text/javascript" src="/jquery.pjax.js"></script>
-  <script type="text/javascript" src="/unit/pjax.js"></script>
-  <script type="text/javascript" src="/unit/fn_pjax.js"></script>
-  <script type="text/javascript" src="/unit/pjax_fallback.js"></script>
+  <script type="text/javascript" src="/test/unit/pjax.js"></script>
+  <script type="text/javascript" src="/test/unit/fn_pjax.js"></script>
+  <script type="text/javascript" src="/test/unit/pjax_fallback.js"></script>
 </head>
 <body>
   <div id="qunit"></div>

diff --git a/test/jquery-1.9.0.js → vendor/jquery.js b/test/jquery-1.9.0.js → vendor/jquery.js
diff --git a/test/qunit.css → vendor/qunit.css b/test/qunit.css → vendor/qunit.css
diff --git a/test/qunit.js → vendor/qunit.js b/test/qunit.js → vendor/qunit.js