wip

rails · May 31, 2010 · e40787a · e40787a
1 parent c623979
commit e40787a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 24 deletions.
diff --git a/test/server.rb b/test/server.rb
@@ -11,6 +11,7 @@
 after do
   ctype = request.xhr? ? 'application/json' : 'text/html'
   content_type ctype, :charset => 'utf-8'
+  @app_base_url='http://localhost:4567'
 end
 
 get '/' do

diff --git a/test/views/ifram-csrf.erb b/test/views/ifram-csrf.erb
diff --git a/test/views/index.erb b/test/views/index.erb
@@ -9,11 +9,13 @@
     <script src="/vendor/rails.js" type="text/javascript"></script>
 
     <script src="/test/settings.js" type="text/javascript"></script>
+    <!--
     <script src="/test/data-confirm.js" type="text/javascript"></script>
     <script src="/test/data-remote.js" type="text/javascript"></script>
     <script src="/test/data-disable.js" type="text/javascript"></script>
     <script src="/test/call-remote.js" type="text/javascript"></script>
     <script src="/test/call-remote-callbacks.js" type="text/javascript"></script>
+    -->
     <script src="/test/data-method.js" type="text/javascript"></script>
 
   </head>
@@ -28,15 +30,15 @@
     <div id='fixtures' class='fixture'></div>
 
     <div id='fixtures-iframe' class='fixture'>
-      <iframe src="http://localhost:4567/iframe" width=450 height=100>
+      <iframe src="<%=@app_base_url%>/iframe" width=450 height=100>
         <div class='iframe'>
           <div id='iframe_form'></div>
         </div>  
       </iframe>
     </div>
 
     <div id='fixtures-iframe-csrf' class='fixture'>
-      <iframe src="http://localhost:4567/iframe-csrf" width=450 height=100>
+      <iframe src="<%=@app_base_url%>/iframe-csrf" width=450 height=100>
         <div class='iframe'>
           <div id='iframe_form'></div>
         </div>