spontaneous 0.2.0.beta1 → 0.2.0.beta2

data/test/test_helper.rb

@@ -19,7 +19,6 @@ $:.unshift(spot_path) if File.directory?(spot_path) && !$:.include?(spot_path)
 require 'rack'
 require 'logger'
 
-
 Sequel.extension :migration
 
 # for future integration with travis
@@ -55,78 +54,28 @@ connection_string = \
     end
   end
 
-puts "DB Connection: #{connection_string}"
+puts "SPOT_ADAPTER=#{ENV["SPOT_ADAPTER"]} => #{connection_string}"
+
 DB = Sequel.connect(connection_string) unless defined?(DB)
 # DB.logger = Logger.new($stdout)
 
 Sequel::Migrator.apply(DB, 'db/migrations')
 
 require File.expand_path(File.dirname(__FILE__) + '/../lib/spontaneous')
-# require File.expand_path(File.dirname(__FILE__) + '/../lib/cutaneous')
-require 'cutaneous'
 
-# require 'test/unit'
+require 'minitest/unit'
 require 'minitest/spec'
-require 'rack/test'
-require 'matchy'
-require 'shoulda'
-require 'timecop'
+require 'minitest-colorize'
 require 'mocha/setup'
 require 'pp'
 require 'tmpdir'
 require 'json'
 
-begin
-  require 'leftright'
-rescue LoadError
-  # fails for ruby 1.9
-end
-
-require 'support/custom_matchers'
-# require 'support/timing'
-
-
-# Spontaneous.database = DB
-
-
-class MiniTestWithHooks < MiniTest::Unit
-  def before_suites
-  end
-
-  def after_suites
-  end
-
-  def exclude?(suite)
-    [MiniTest::Spec, Test::Unit::TestCase].include?(suite)
-  end
-
-  def _run_suites(suites, type)
-    names = suites.reject { |s| exclude?(s) }.map { |s| s.to_s.gsub(/Test$/, '') }
-    @max_name_length = names.map(&:length).max
-    begin
-      before_suites
-      super(suites, type)
-    ensure
-      after_suites
-    end
-  end
-
-  def _run_suite(suite, type)
-    begin
-      unless exclude?(suite)
-        print "\n#{suite.to_s.gsub(/Test$/, '').ljust(@max_name_length, " ")}  "
-      end
-      suite.startup if suite.respond_to?(:startup)
-      super(suite, type)
-    ensure
-      suite.shutdown if suite.respond_to?(:shutdown)
-    end
-  end
-end
+require 'support/rack'
+require 'support/matchers'
+require 'support/minitest'
 
-
-
-MiniTest::Unit.runner = MiniTestWithHooks.new
+MiniTest::Unit.runner = StartFinishRunner.new
 
 def silence_logger(&block)
   begin
@@ -141,8 +90,6 @@ def silence_logger(&block)
 end
 
 class MiniTest::Spec
-  include CustomMatchers
-
   attr_accessor :template_root
   alias :silence_stdout :silence_logger
 
@@ -194,7 +141,7 @@ class MiniTest::Spec
       assert_equal(result[col], compare[col], "Column '#{col}' should be equal")
     end
     serialised_columns.each do |col|
-      result.send(col).should == compare.send(col)
+      result.send(col).must_equal compare.send(col)
     end
   end
 
@@ -273,15 +220,21 @@ class MiniTest::Spec
 
   def assert_login_page(path = nil, method = "GET")
     assert last_response.status == 401, "#{method} #{path} should have status 401 but has #{last_response.status}"
-    last_response.body.should =~ %r{<form.+action="/@spontaneous/login"}
-    last_response.body.should =~ %r{<form.+method="post"}
-    last_response.body.should =~ %r{<input.+name="user\[login\]"}
-    last_response.body.should =~ %r{<input.+name="user\[password\]"}
+    last_response.body.must_match %r{<form.+action="/@spontaneous/login"}
+    last_response.body.must_match %r{<form.+method="post"}
+    last_response.body.must_match %r{<input.+name="user\[login\]"}
+    last_response.body.must_match %r{<input.+name="user\[password\]"}
   end
 
+  def assert_contains_csrf_token(key)
+    body = last_response.body
+    match = /csrf_token: *('|")(.*)\1/.match(body)
+    flunk "CSRF token not included in template" unless match
+    token = match[2]
+    assert key.csrf_token_valid?(token), "Invalid token #{token.inspect}"
+  end
 end
 
-
-
 require 'minitest/autorun'
 
+

data/test/test_integration_helper.rb

@@ -5,9 +5,7 @@ require "rbconfig"
 require "rubygems"
 
 # 1.9.2's minitest is way out of date
-if RUBY_VERSION < "1.9.3"
-  gem "minitest"
-end
+gem "minitest"
 
 require "minitest/unit"
 require "minitest/autorun"