Skip to content

Commit

Permalink
Updated test environment
Browse files Browse the repository at this point in the history
  • Loading branch information
bcardarella committed Jul 21, 2012
1 parent 6baefb4 commit c86621d
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 11 deletions.
6 changes: 6 additions & 0 deletions Gemfile
Expand Up @@ -2,3 +2,9 @@ source "http://rubygems.org"

# Specify your gem's dependencies in client_side_validations.gemspec
gemspec

if RUBY_VERSION >= '1.9.3'
gem 'debugger'
elsif RUBY_VERSION < '1.9'
gem 'minitest'
end
1 change: 1 addition & 0 deletions client_side_validations.gemspec
Expand Up @@ -25,6 +25,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'mocha'
s.add_development_dependency 'simple_form', '~> 1.5.0'
s.add_development_dependency 'formtastic', '~> 2.0.0'
s.add_development_dependency 'm'

# For QUnit testing
s.add_development_dependency 'sinatra', '~> 1.0'
Expand Down
14 changes: 14 additions & 0 deletions test/base_helper.rb
Expand Up @@ -2,6 +2,20 @@
require 'bundler'
Bundler.setup
require 'test/unit'
if RUBY_VERSION >= '1.9.3'
require 'debugger'
end
require 'mocha'
require 'rails'

# Pulled from railties/test/abstract_unit in Rails 3.1
module TestApp
class Application < Rails::Application
config.root = File.dirname(__FILE__)
config.active_support.deprecation = :log
config.logger = Logger.new(STDOUT)
end
end


module ClientSideValidations; end
11 changes: 0 additions & 11 deletions test/middleware/cases/helper.rb
@@ -1,17 +1,6 @@
require 'base_helper'
require 'action_controller'
require 'action_controller/railtie'
require 'rails'

# Pulled from railties/test/abstract_unit in Rails 3.1
module TestApp
class Application < Rails::Application
config.root = File.dirname(__FILE__)
config.active_support.deprecation = :log
config.logger = Logger.new(STDOUT)
end
end

require 'client_side_validations/middleware'
require 'client_side_validations/engine'

Expand Down

0 comments on commit c86621d

Please sign in to comment.