Clean up use of __FILE__ in tests where a simple 'require' works fine

Remove old railsbridge-apps.md todo-lookin' file

Author: tjgrathwell

app.rb

@@ -153,19 +153,19 @@ def render_page
   end
 
   get "/:site/:name.:ext" do
-    if not sites.include?(params[:site])
-      forward  # send it on to the downstream file server
-    else
+    if sites.include?(params[:site])
       send_file "#{site_dir}/#{params[:name]}.#{params[:ext]}"
+    else
+      forward  # send it on to the downstream file server
     end
   end
 
   # todo: make this work in a general way, without hardcoded 'img'
   get "/:site/img/:name.:ext" do
-    if not sites.include?(params[:site])
-      forward  # send it on to the downstream file server
-    else
+    if sites.include?(params[:site])
       send_file "#{site_dir}/img/#{params[:name]}.#{params[:ext]}"
+    else
+      forward  # send it on to the downstream file server
     end
   end
 

md2step

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 here = File.expand_path File.dirname __FILE__
 $:<<here
-require 'lib/github_flavored_markdown'
-include GithubFlavoredMarkdown
+
 ARGV.each do |arg|
   old_path = arg
   new_path = arg.gsub(/\.md$/, '.step')

railsbridge-apps.md

@@ -1,7 +1,6 @@
-here = File.expand_path File.dirname(__FILE__)
-require "#{here}/spec_helper"
+require "spec_helper"
 
-require "#{here}/../app"
+require_relative "../app"
 require "rack/test"
 
 # todo: use a dummy set of sites instead of the real "installfest" and "curriculum"

spec/app_spec.rb

@@ -1,8 +1,9 @@
-here = File.expand_path File.dirname(__FILE__)
-require "#{here}/spec_helper"
+require "spec_helper"
+
+require_relative "../app"
+require_relative "../lib/contents"
 
-require "#{here}/../app"
-require "#{here}/../lib/contents"
+here = File.expand_path File.dirname(__FILE__)
 
 describe Contents do
   before :all do

spec/contents_spec.rb

@@ -1,5 +1,4 @@
-here = File.expand_path File.dirname(__FILE__)
-require "#{here}/spec_helper"
+require "spec_helper"
 
 require "markdown_page"
 

spec/markdown_spec.rb

@@ -1,6 +1,4 @@
-here = File.expand_path File.dirname(__FILE__)
-require "#{here}/spec_helper"
-
+require 'spec_helper'
 require "media_wiki"
 
 include MediaWiki

spec/media_wiki_spec.rb

@@ -1,8 +1,7 @@
-here = File.expand_path File.dirname(__FILE__)
-require "#{here}/spec_helper"
+require "spec_helper"
 
-require "#{here}/../app"
-require "#{here}/../lib/site_index"
+require_relative "../app"
+require_relative "../lib/site_index"
 
 describe Contents do
   before :all do

spec/site_index_spec.rb

@@ -1,5 +1,4 @@
-here = File.expand_path File.dirname(__FILE__)
-require "#{here}/spec_helper"
+require "spec_helper"
 
 require "site"
 

spec/site_spec.rb

@@ -1,6 +1,6 @@
-here = File.expand_path File.dirname(__FILE__)
-require "#{here}/spec_helper"
-require "#{here}/../app"
+require "spec_helper"
+require_relative "../app"
+
 require "site"
 
 require "rack/test"

spec/site_syntax_spec.rb

@@ -1,5 +1,4 @@
-here = File.expand_path File.dirname(__FILE__)
-require "#{here}/spec_helper"
+require "spec_helper"
 
 require "step_page"
 

spec/step_page_spec.rb

@@ -1,10 +1,8 @@
-here = File.expand_path File.dirname(__FILE__)
-require "#{here}/spec_helper"
+require 'spec_helper'
 
 require "step_page"
 
 describe Step do
-
   def to_html nokogiri_node
     nokogiri_node.serialize(:save_with => 0).chomp
   end