Improve tests and testing environment

.gitignore

@@ -4,3 +4,4 @@ wiki/
 Gemfile.lock
 .DS_Store
 tmp/
+.bundle

Gemfile

@@ -1,3 +1,7 @@
 source :rubygems
 
 gemspec
+
+group :testing do
+  gem "pry"
+end

spec/sinatra/activerecord/rake_spec.rb

@@ -10,9 +10,6 @@ def schema_version
   end
 
   before(:each) do
-    FileUtils.mkdir_p("tmp")
-    FileUtils.rm_rf("tmp/foo.sqlite3")
-
     ActiveRecord::Base.remove_connection
     ActiveRecord::Base.establish_connection("sqlite3:///tmp/foo.sqlite3")
     ActiveRecord::Migrator.migrations_paths = "tmp"
@@ -26,7 +23,6 @@ def schema_version
 
   after(:each) do
     FileUtils.rm_rf("db")
-    FileUtils.rm_rf("tmp")
   end
 
   it "uses ActiveRecord::Migrator.migrations_paths for the migration directory" do

spec/sinatra/activerecord_spec.rb

@@ -33,12 +33,8 @@ def new_sinatra_application
   end
 
   it "establishes the database connection when set" do
-    expect {
-      @app.set :database, database_url
-    }.to change{ActiveRecord::Base.connected?}.to(true)
-    expect {
-      @app.set :database, database_url
-    }.to change{ActiveRecord::Base.connection.last_use}
+    expect { @app.set :database, database_url }.to establish_database_connection
+    expect { @app.set :database, database_url }.to change{ActiveRecord::Base.connection.last_use}
   end
 
   it "can have the SQLite database in a folder" do
@@ -52,18 +48,13 @@ def new_sinatra_application
   end
 
   it "accepts a hash for the database" do
-    expect {
-      @app.set :database, {adapter: "sqlite3", database: "tmp/foo.sqlite3"}
-    }.to change{ActiveRecord::Base.connected?}.to(true)
+    expect { @app.set :database, {adapter: "sqlite3", database: "tmp/foo.sqlite3"} }.to establish_database_connection
   end
 
   describe "database file" do
     it "accepts a filename for the database" do
-      FileUtils.mkdir_p("tmp")
       FileUtils.cp("spec/fixtures/database.yml", "tmp")
-      expect {
-        @app.set :database_file, "database.yml"
-      }.to change{ActiveRecord::Base.connected?}.to(true)
+      expect { @app.set :database_file, "database.yml" }.to establish_database_connection
     end
 
     it "doesn't raise errors on missing #app_file" do
@@ -82,18 +73,14 @@ def new_sinatra_application
 
     it "establishes the connection upon registering" do
       ActiveRecord::Base.remove_connection
-      expect {
-        @app = new_sinatra_application
-      }.to change{ActiveRecord::Base.connected?}.to(true)
+      expect { @app = new_sinatra_application }.to establish_database_connection
     end
 
     it "is overriden by config/database.yml" do
       FileUtils.mkdir_p("tmp/config")
       FileUtils.touch("tmp/config/database.yml")
 
-      expect {
-        @app = new_sinatra_application
-      }.to raise_error(ActiveRecord::AdapterNotSpecified)
+      expect { @app = new_sinatra_application }.to raise_error(ActiveRecord::AdapterNotSpecified)
     end
   end
 end

spec/spec_helper.rb

@@ -1 +1,20 @@
+begin
+  require "pry"
+rescue LoadError
+end
+
 ROOT = File.expand_path("../", File.dirname(__FILE__))
+Dir[File.join(ROOT, "spec/support/**/*.rb")].each &method(:require)
+
+RSpec.configure do |config|
+  config.before(:each) do
+    FileUtils.mkdir_p("tmp")
+    FileUtils.rm("tmp/foo.sqlite3") if File.exists?("tmp/foo.sqlite3")
+  end
+
+  config.after(:each) do
+    FileUtils.rm_rf("tmp")
+  end
+
+  config.include Helpers
+end

spec/support/helpers.rb

@@ -0,0 +1,5 @@
+module Helpers
+  def establish_database_connection
+    change{ActiveRecord::Base.connected?}.to(true)
+  end
+end