Merge branch 'feature/rails3' into feature/rails3_update_dependencies

pull/135/head
Philipp Tessenow 12 years ago
commit 065e51e190
  1. 1
      .gitignore
  2. 4
      Gemfile
  3. 11
      test/unit/comment_test.rb

1
.gitignore vendored

@ -41,6 +41,7 @@
/doc/app /doc/app
#/Gemfile.lock #/Gemfile.lock
/Gemfile.local /Gemfile.local
/Gemfile.plugins
/.rvmrc* /.rvmrc*
/.ruby-version /.ruby-version

@ -171,8 +171,8 @@ platforms :jruby do
end end
end end
# Load Gemfile.local and plugins' Gemfiles # Load Gemfile.local, Gemfile.plugins and plugins' Gemfiles
Dir.glob File.expand_path("../{Gemfile.local,lib/plugins/*/Gemfile}", __FILE__) do |file| Dir.glob File.expand_path("../{Gemfile.local,Gemfile.plugins,lib/plugins/*/Gemfile}", __FILE__) do |file|
next unless File.readable?(file) next unless File.readable?(file)
instance_eval File.read(file) instance_eval File.read(file)
end end

@ -16,17 +16,6 @@ require_relative '../test_helper'
class CommentTest < ActiveSupport::TestCase class CommentTest < ActiveSupport::TestCase
include MiniTest::Assertions # refute include MiniTest::Assertions # refute
def setup
super
DatabaseCleaner.clean_with :truncation
DatabaseCleaner.strategy = :transaction
DatabaseCleaner.start
end
def teardown
DatabaseCleaner.clean
end
def test_validations def test_validations
# factory valid # factory valid
assert FactoryGirl.build(:comment).valid? assert FactoryGirl.build(:comment).valid?

Loading…
Cancel
Save