Merge branch 'master' of git@github.com:iafonov/small-blog

iafonov · Feb 4, 2009 · abf7d25 · abf7d25
2 parents 465d765 + 74fda1b
commit abf7d25
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/Rakefile b/Rakefile
@@ -1,3 +1,5 @@
+$:.unshift File.dirname(__FILE__) + '/sinatra/lib'
+
 require 'rubygems'
 require 'sinatra'
 require 'RMagick'

diff --git a/main.rb b/main.rb
@@ -1,3 +1,5 @@
+$:.unshift File.dirname(__FILE__) + '/sinatra/lib'
+
 require 'rubygems'
 require 'sinatra'
 require 'activerecord'

diff --git a/sinatra b/sinatra
@@ -0,0 +1 @@
+../sinatra/
diff --git a/test/spec_test.rb b/test/spec_test.rb
@@ -1,16 +1,4 @@
-root_dir = File.expand_path("#{File.dirname(__FILE__)}/..").sub(/^#{Dir.getwd}/, '.')
-
-puts root_dir
-
-$:.unshift "#{root_dir}/sinatra/lib" if File.exist?("#{root_dir}/sinatra")
-$:.unshift "#{root_dir}/lib"
-$:.unshift "#{root_dir}/test"
-
-require 'rubygems'
-require 'spec/interop/test'
-require 'sinatra/test/unit'
-
-load 'main.rb'
+require 'helper.rb'
 
 describe 'my application' do
   it 'should show redirect to about page if accessed from root context' do