clearance 0.8.8 → 0.9.0.rc1

data/test/controllers/users_controller_test.rb

@@ -4,7 +4,7 @@ class UsersControllerTest < ActionController::TestCase
 
   tests Clearance::UsersController
 
-  should_filter_params :password
+  should filter_param(:password)
 
   context "when signed out" do
     setup { sign_out }
@@ -12,9 +12,9 @@ class UsersControllerTest < ActionController::TestCase
     context "on GET to #new" do
       setup { get :new }
 
-      should_respond_with :success
-      should_render_template :new
-      should_not_set_the_flash
+      should respond_with(:success)
+      should render_template(:new)
+      should_not set_the_flash
 
       should_display_a_sign_up_form
     end
@@ -33,11 +33,15 @@ class UsersControllerTest < ActionController::TestCase
     context "on POST to #create with valid attributes" do
       setup do
         user_attributes = Factory.attributes_for(:user)
+        @old_user_count = User.count
         post :create, :user => user_attributes
       end
 
       should_assign_to :user
-      should_change 'User.count', :by => 1
+
+      should "create a new user" do
+        assert_equal @old_user_count + 1, User.count
+      end
 
       should "send the confirmation email" do
         assert_sent_email do |email|
@@ -45,7 +49,7 @@ class UsersControllerTest < ActionController::TestCase
         end
       end
 
-      should_set_the_flash_to /confirm/i
+      should set_the_flash.to(/confirm/i)
       should_redirect_to_url_after_create
     end
   end
@@ -53,12 +57,12 @@ class UsersControllerTest < ActionController::TestCase
   signed_in_user_context do
     context "GET to new" do
       setup { get :new }
-      should_redirect_to("the home page") { root_url }
+      should redirect_to("the home page") { root_url }
     end
 
     context "POST to create" do
       setup { post :create, :user => {} }
-      should_redirect_to("the home page") { root_url }
+      should redirect_to("the home page") { root_url }
     end
   end
 

data/test/models/clearance_mailer_test.rb

@@ -5,7 +5,7 @@ class ClearanceMailerTest < ActiveSupport::TestCase
   context "A change password email" do
     setup do
       @user  = Factory(:user)
-      @email = ClearanceMailer.create_change_password @user
+      @email = ClearanceMailer.change_password @user
     end
 
     should "be from DO_NOT_REPLY" do
@@ -30,7 +30,7 @@ class ClearanceMailerTest < ActiveSupport::TestCase
   context "A confirmation email" do
     setup do
       @user  = Factory(:user)
-      @email = ClearanceMailer.create_confirmation @user
+      @email = ClearanceMailer.confirmation @user
     end
 
     should "be from DO_NOT_REPLY" do

data/test/models/user_test.rb

@@ -2,26 +2,31 @@ require 'test_helper'
 
 class UserTest < ActiveSupport::TestCase
 
+  # db
+
+  should have_db_index(:email)
+  should have_db_index(:remember_token)
+
   # signing up
 
   context "When signing up" do
     should_validate_presence_of :email, :password
-    should_allow_values_for     :email, "foo@example.com"
-    should_not_allow_values_for :email, "foo"
-    should_not_allow_values_for :email, "example.com"
+    should allow_value("foo@example.com").for(:email)
+    should_not allow_value("foo").for(:email)
+    should_not allow_value("example.com").for(:email)
 
     should "require password confirmation on create" do
       user = Factory.build(:user, :password              => 'blah',
                                   :password_confirmation => 'boogidy')
       assert ! user.save
-      assert user.errors.on(:password)
+      assert user.errors[:password].any?
     end
 
     should "require non blank password confirmation on create" do
       user = Factory.build(:user, :password              => 'blah',
                                   :password_confirmation => '')
       assert ! user.save
-      assert user.errors.on(:password)
+      assert user.errors[:password].any?
     end
 
     should "initialize salt" do
@@ -234,7 +239,8 @@ class UserTest < ActiveSupport::TestCase
 
     subject { @user }
 
-    should_allow_values_for :email, nil, ""
+    should allow_value(nil).for(:email)
+    should allow_value("").for(:email)
   end
 
   context "a user with an optional password" do
@@ -249,7 +255,8 @@ class UserTest < ActiveSupport::TestCase
 
     subject { @user }
 
-    should_allow_values_for :password, nil, ""
+    should allow_value(nil).for(:password)
+    should allow_value("").for(:password)
   end
 
 end

data/test/rails_root/app/helpers/application_helper.rb

@@ -1,5 +1,2 @@
 module ApplicationHelper
-  def body_class
-    "#{controller.controller_name} #{controller.controller_name}-#{controller.action_name}"
-  end
 end

data/test/rails_root/config/application.rb

@@ -0,0 +1,46 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+# If you have a Gemfile, require the gems listed there, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(:default, Rails.env) if defined?(Bundler)
+
+module Rails3Root
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Add additional load paths for your own custom dirs
+    # config.load_paths += %W( #{config.root}/extras )
+
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # Configure generators values. Many other options are available, be sure to check the documentation.
+    # config.generators do |g|
+    #   g.orm             :active_record
+    #   g.template_engine :erb
+    #   g.test_framework  :test_unit, :fixture => true
+    # end
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+  end
+end

data/test/rails_root/config/boot.rb

@@ -1,110 +1,6 @@
-# Don't change this file!
-# Configure your app in config/environment.rb and config/environments/*.rb
-
-RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
-
-module Rails
-  class << self
-    def boot!
-      unless booted?
-        preinitialize
-        pick_boot.run
-      end
-    end
-
-    def booted?
-      defined? Rails::Initializer
-    end
-
-    def pick_boot
-      (vendor_rails? ? VendorBoot : GemBoot).new
-    end
-
-    def vendor_rails?
-      File.exist?("#{RAILS_ROOT}/vendor/rails")
-    end
-
-    def preinitialize
-      load(preinitializer_path) if File.exist?(preinitializer_path)
-    end
-
-    def preinitializer_path
-      "#{RAILS_ROOT}/config/preinitializer.rb"
-    end
-  end
-
-  class Boot
-    def run
-      load_initializer
-      Rails::Initializer.run(:set_load_path)
-    end
-  end
-
-  class VendorBoot < Boot
-    def load_initializer
-      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
-      Rails::Initializer.run(:install_gem_spec_stubs)
-      Rails::GemDependency.add_frozen_gem_path
-    end
-  end
-
-  class GemBoot < Boot
-    def load_initializer
-      self.class.load_rubygems
-      load_rails_gem
-      require 'initializer'
-    end
-
-    def load_rails_gem
-      if version = self.class.gem_version
-        gem 'rails', version
-      else
-        gem 'rails'
-      end
-    rescue Gem::LoadError => load_error
-      $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
-      exit 1
-    end
-
-    class << self
-      def rubygems_version
-        Gem::RubyGemsVersion rescue nil
-      end
-
-      def gem_version
-        if defined? RAILS_GEM_VERSION
-          RAILS_GEM_VERSION
-        elsif ENV.include?('RAILS_GEM_VERSION')
-          ENV['RAILS_GEM_VERSION']
-        else
-          parse_gem_version(read_environment_rb)
-        end
-      end
-
-      def load_rubygems
-        require 'rubygems'
-        min_version = '1.3.1'
-        unless rubygems_version >= min_version
-          $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
-          exit 1
-        end
-
-      rescue LoadError
-        $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
-        exit 1
-      end
-
-      def parse_gem_version(text)
-        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
-      end
-
-      private
-        def read_environment_rb
-          File.read("#{RAILS_ROOT}/config/environment.rb")
-        end
-    end
-  end
+require 'rubygems'
+# Set up gems listed in the Gemfile.
+if File.exist?(File.expand_path('../../Gemfile', __FILE__))
+  require 'bundler'
+  Bundler.setup
 end
-
-# All that for this:
-Rails.boot!

data/test/rails_root/config/environment.rb

@@ -1,17 +1,7 @@
-require File.join(File.dirname(__FILE__), 'boot')
-require 'digest/md5'
+# Load the rails application
+require File.expand_path('../application', __FILE__)
 
-Rails::Initializer.run do |config|
-  config.load_paths += Dir.glob(File.join(RAILS_ROOT, 'vendor', 'gems', '*', 'lib'))
-  config.time_zone = 'Eastern Time (US & Canada)'
-  config.action_controller.session = {
-    :session_key => "_clearance_session",
-    :secret      => ['clearance', 'random', 'words', 'here'].map {|k| Digest::MD5.hexdigest(k) }.join
-  }
+# Initialize the rails application
+Rails3Root::Application.initialize!
 
-  config.gem "justinfrench-formtastic", 
-    :lib     => 'formtastic', 
-    :source  => 'http://gems.github.com'
-
-  config.action_mailer.default_url_options = { :host => 'localhost:3000' }
-end
+ActionMailer::Base.default_url_options = { :host => 'localhost:3000' }

data/test/rails_root/config/environments/development.rb

@@ -1,19 +1,19 @@
-# Settings specified here will take precedence over those in config/environment.rb
+Rails3Root::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
 
-# In the development environment your application's code is reloaded on
-# every request.  This slows down response time but is perfect for development
-# since you don't have to restart the webserver when you make code changes.
-config.cache_classes = false
+  # In the development environment your application's code is reloaded on
+  # every request.  This slows down response time but is perfect for development
+  # since you don't have to restart the webserver when you make code changes.
+  config.cache_classes = false
 
-# Log error messages when you accidentally call methods on nil.
-config.whiny_nils = true
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
 
-# Show full error reports and disable caching
-config.action_controller.consider_all_requests_local = true
-config.action_controller.perform_caching             = false
-config.action_view.debug_rjs                         = true
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_view.debug_rjs             = true
+  config.action_controller.perform_caching = false
 
-# Don't care if the mailer can't send
-config.action_mailer.raise_delivery_errors = false
-
-HOST = "localhost"
+  # Don't care if the mailer can't send
+  config.action_mailer.raise_delivery_errors = false
+end

data/test/rails_root/config/environments/production.rb

@@ -1 +1,42 @@
-HOST = "http://example.com"
+Rails3Root::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
+
+  # The production environment is meant for finished, "live" apps.
+  # Code is not reloaded between requests
+  config.cache_classes = true
+
+  # Full error reports are disabled and caching is turned on
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Specifies the header that your server uses for sending files
+  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+
+  # For nginx:
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+
+  # If you have no front-end server that supports something like X-Sendfile,
+  # just comment this out and Rails will serve the files
+
+  # See everything in the log (default is :info)
+  # config.log_level = :debug
+
+  # Use a different logger for distributed setups
+  # config.logger = SyslogLogger.new
+
+  # Use a different cache store in production
+  # config.cache_store = :mem_cache_store
+
+  # Disable Rails's static asset server
+  # In production, Apache or nginx will already do this
+  config.serve_static_assets = false
+
+  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # config.action_controller.asset_host = "http://assets.example.com"
+
+  # Disable delivery errors, bad email addresses will be ignored
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable threaded mode
+  # config.threadsafe!
+end

data/test/rails_root/config/environments/test.rb

@@ -1,36 +1,32 @@
-# Settings specified here will take precedence over those in config/environment.rb
+Rails3Root::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
 
-# The test environment is used exclusively to run your application's
-# test suite.  You never need to work with it otherwise.  Remember that
-# your test database is "scratch space" for the test suite and is wiped
-# and recreated between test runs.  Don't rely on the data there!
-config.cache_classes = true
+  # The test environment is used exclusively to run your application's
+  # test suite.  You never need to work with it otherwise.  Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs.  Don't rely on the data there!
+  config.cache_classes = true
 
-# Log error messages when you accidentally call methods on nil.
-config.whiny_nils = true
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
 
-# Show full error reports and disable caching
-config.action_controller.consider_all_requests_local = true
-config.action_controller.perform_caching             = false
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
 
-# Disable request forgery protection in test environment
-config.action_controller.allow_forgery_protection    = false
+  # Raise exceptions instead of rendering exception templates
+  config.action_dispatch.show_exceptions = false
 
-# Tell ActionMailer not to deliver emails to the real world.
-# The :test delivery method accumulates sent emails in the
-# ActionMailer::Base.deliveries array.
-config.action_mailer.delivery_method = :test
+  # Disable request forgery protection in test environment
+  config.action_controller.allow_forgery_protection    = false
 
-config.gem 'shoulda',
-  :source  => "http://gemcutter.org",
-  :version => '>= 2.9.1'
-config.gem 'factory_girl',
-  :source  => "http://gemcutter.org",
-  :version => '>= 1.2.3'
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
 
-config.gem 'cucumber-rails',
-  :lib     => false,
-  :version => '>= 0.2.2'
-config.gem 'webrat',
-  :lib     => false,
-  :version => '>= 0.6.0'
+  # Use SQL instead of Active Record's schema dumper when creating the test database.
+  # This is necessary if your schema can't be completely dumped by the schema dumper,
+  # like if you have constraints or database-specific column types
+  # config.active_record.schema_format = :sql
+end