diff --git a/.rspec b/.rspec index 53607ea..84fa7d2 100644 --- a/.rspec +++ b/.rspec @@ -1 +1,3 @@ ---colour +--format nested +--color +--drb diff --git a/.rvmrc b/.rvmrc new file mode 100644 index 0000000..87273d1 --- /dev/null +++ b/.rvmrc @@ -0,0 +1 @@ +rvm use 1.9.2@global --create diff --git a/db/seeds.rb b/db/seeds.rb index 5d26536..21b4ed7 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,4 +1,4 @@ -user = User.create :email => 'user@app.com', - :password => 'useruser', +user = User.create :email => 'user@app.com', + :password => 'useruser', :password_confirmation => 'useruser' -user.confirm! \ No newline at end of file +user.confirm! diff --git a/spec/factories.rb b/spec/factories.rb index 64f6d4d..c8a6136 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -1,15 +1,12 @@ FactoryGirl.define do factory :user do - end factory :domain do - end factory :record do - end end \ No newline at end of file diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 340c4cd..71a1f19 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,9 +1,6 @@ require 'rubygems' require 'spork' -# Loading more in this block will cause your tests to run faster. However, -# if you change any configuration or code from libraries loaded here, you'll -# need to restart spork for it take effect. Spork.prefork do ENV["RAILS_ENV"] ||= 'test' require File.expand_path("../../config/environment", __FILE__) @@ -16,7 +13,5 @@ Spork.prefork do end Spork.each_run do - # Requires supporting ruby files with custom matchers and macros, etc, - # in spec/support/ and its subdirectories. Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f} end