Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of git@github.com:jm81/dm-devise.git

  • Loading branch information...
commit bd6d081dbe00a5d39d7b271430baaf1e6e1c230e 2 parents 16f3cca + 9048af2
Jared Morgan jm81 authored
2  lib/devise/orm/data_mapper/schema.rb
View
@@ -29,7 +29,7 @@ def apply_devise_schema(name, type, options={})
if String == type && !options[:length]
options[:length] = 255
end
-
+
options[:required] ||= false
options.delete(:default) if options[:default].nil?
2  test/data_mapper/compatibility_test.rb
View
@@ -4,7 +4,7 @@ class DataMapperCompatibilityTest < ActiveSupport::TestCase
def teardown
User.raise_on_save_failure = false
end
-
+
test 'respects raise_on_save_failure' do
User.raise_on_save_failure = true
user = new_user(:email => nil)
4 test/generators/data_mapper_generator_test.rb
View
@@ -7,12 +7,12 @@ class DataMapperGeneratorTest < Rails::Generators::TestCase
tests DataMapper::Generators::DeviseGenerator
destination File.expand_path("../../tmp", __FILE__)
setup :prepare_destination
-
+
test "all files are properly created" do
run_generator %w(monster)
assert_file "app/models/monster.rb", /devise/
end
-
+
test "all files are properly deleted" do
run_generator %w(monster)
run_generator %w(monster), :behavior => :revoke
Please sign in to comment.
Something went wrong with that request. Please try again.