janova-clearance 0.8.8 → 0.9.1

data/test/controllers/passwords_controller_test.rb

@@ -4,8 +4,8 @@ class PasswordsControllerTest < ActionController::TestCase
 
   tests Clearance::PasswordsController
 
-  should_route :get, '/users/1/password/edit',
-    :controller => 'clearance/passwords', :action  => 'edit', :user_id => '1'
+  should route(:get, '/users/1/password/edit').
+           to(:controller => 'clearance/passwords', :action  => 'edit', :user_id => '1')
 
   context "a signed up user" do
     setup do
@@ -15,8 +15,8 @@ class PasswordsControllerTest < ActionController::TestCase
     context "on GET to #new" do
       setup { get :new, :user_id => @user.to_param }
 
-      should_respond_with :success
-      should_render_template "new"
+      should respond_with(:success)
+      should render_template(:new)
     end
 
     context "on POST to #create" do
@@ -30,13 +30,9 @@ class PasswordsControllerTest < ActionController::TestCase
           assert_not_nil @user.reload.confirmation_token
         end
 
-        should "send the change your password email" do
-          assert_sent_email do |email|
-            email.subject =~ /change your password/i
-          end
-        end
+        should have_sent_email.with_subject(/change your password/i)
 
-        should_set_the_flash_to /password/i
+        should set_the_flash.to(/password/i)
         should_redirect_to_url_after_create
       end
 
@@ -64,7 +60,7 @@ class PasswordsControllerTest < ActionController::TestCase
           assert_match /unknown email/i, flash.now[:failure]
         end
 
-        should_render_template :new
+        should render_template(:new)
       end
     end
   end
@@ -85,9 +81,8 @@ class PasswordsControllerTest < ActionController::TestCase
         assert_equal @user, assigns(:user)
       end
 
-      should_respond_with :success
-      should_render_template "edit"
-      should_display_a_password_update_form
+      should respond_with(:success)
+      should render_template(:edit)
     end
 
     should_forbid "on GET to #edit with correct id but blank token" do
@@ -127,7 +122,7 @@ class PasswordsControllerTest < ActionController::TestCase
         assert_not_nil @user.remember_token
       end
 
-      should_set_the_flash_to(/signed in/i)
+      should set_the_flash.to(/signed in/i)
       should_redirect_to_url_after_update
     end
 
@@ -155,12 +150,13 @@ class PasswordsControllerTest < ActionController::TestCase
         assert_not_nil @user.confirmation_token
       end
 
-      should_not_be_signed_in
-      should_not_set_the_flash
-      should_respond_with    :success
-      should_render_template :edit
+      should "not be signed in" do
+        assert_nil cookies[:remember_token]
+      end
 
-      should_display_a_password_update_form
+      should_not set_the_flash
+      should respond_with(:success)
+      should render_template(:edit)
     end
 
     should_forbid "on PUT to #update with id but no token" do

data/test/controllers/sessions_controller_test.rb

@@ -1,18 +1,16 @@
 require 'test_helper'
 
 class SessionsControllerTest < ActionController::TestCase
-
   tests Clearance::SessionsController
 
-  should_filter_params :password
+  should filter_param(:password)
 
   context "on GET to /sessions/new" do
     setup { get :new }
 
-    should_respond_with    :success
-    should_render_template :new
-    should_not_set_the_flash
-    should_display_a_sign_in_form
+    should respond_with(:success)
+    should render_template(:new)
+    should_not set_the_flash
   end
 
   context "on POST to #create with unconfirmed credentials" do
@@ -41,11 +39,13 @@ class SessionsControllerTest < ActionController::TestCase
                       :password => @user.password }
     end
 
-    should_set_the_flash_to /signed in/i
+    should set_the_flash.to(/signed in/i)
     should_redirect_to_url_after_create
 
-    should 'set the cookie' do
-      assert ! cookies['remember_token'].empty?
+    should_set_cookie("remember_token", "old-token", Clearance.configuration.cookie_expiration.call)
+
+    should "have a default of 1 year from now" do
+      assert_in_delta Clearance.configuration.cookie_expiration.call, 1.year.from_now, 100
     end
 
     should "not change the remember token" do
@@ -53,6 +53,46 @@ class SessionsControllerTest < ActionController::TestCase
     end
   end
 
+  context "on POST to #create with good credentials - cookie duration set to 2 weeks" do
+    custom_duration = 2.weeks.from_now.utc
+
+    setup do
+      Clearance.configuration.cookie_expiration = lambda { custom_duration }
+      @user = Factory(:email_confirmed_user)
+      @user.update_attribute(:remember_token, "old-token2")
+      post :create, :session => {
+                      :email    => @user.email,
+                      :password => @user.password }
+    end
+
+    should_set_cookie("remember_token", "old-token2", custom_duration)
+
+    teardown do
+      # restore default Clearance configuration
+      Clearance.configuration = nil
+      Clearance.configure {}
+    end
+  end
+
+  context "on POST to #create with good credentials - cookie expiration set to nil (session cookie)" do
+    setup do
+      Clearance.configuration.cookie_expiration = lambda { nil }
+      @user = Factory(:email_confirmed_user)
+      @user.update_attribute(:remember_token, "old-token3")
+      post :create, :session => {
+                      :email    => @user.email,
+                      :password => @user.password }
+    end
+
+    should_set_cookie("remember_token", "old-token3", nil)
+
+    teardown do
+      # restore default Clearance configuration
+      Clearance.configuration = nil
+      Clearance.configure {}
+    end
+  end
+
   context "on POST to #create with good credentials and a session return url" do
     setup do
       @user = Factory(:email_confirmed_user)
@@ -63,7 +103,7 @@ class SessionsControllerTest < ActionController::TestCase
                       :password => @user.password }
     end
 
-    should_redirect_to("the return URL") { @return_url }
+    should redirect_to("the return URL") { @return_url }
   end
 
   context "on POST to #create with good credentials and a request return url" do
@@ -76,7 +116,7 @@ class SessionsControllerTest < ActionController::TestCase
                       :return_to => @return_url
     end
 
-    should_redirect_to("the return URL") { @return_url }
+    should redirect_to("the return URL") { @return_url }
   end
 
   context "on POST to #create with good credentials and a session return url and request return url" do
@@ -90,7 +130,7 @@ class SessionsControllerTest < ActionController::TestCase
                       :return_to => '/url_in_the_request'
     end
 
-    should_redirect_to("the return URL") { @return_url }
+    should redirect_to("the return URL") { @return_url }
   end
 
   context "on POST to #create with bad credentials" do
@@ -100,13 +140,12 @@ class SessionsControllerTest < ActionController::TestCase
                       :password    => "bad value" }
     end
 
-    should_set_the_flash_to /bad/i
-    should_respond_with    :unauthorized
-    should_render_template :new
-    should_not_be_signed_in
+    should set_the_flash.to(/bad/i)
+    should respond_with(:unauthorized)
+    should render_template(:new)
 
-    should 'not create the cookie' do
-      assert_nil cookies['remember_token']
+    should "not be signed in" do
+      assert_nil cookies[:remember_token]
     end
   end
 
@@ -115,7 +154,7 @@ class SessionsControllerTest < ActionController::TestCase
       sign_out
       delete :destroy
     end
-    should_set_the_flash_to(/signed out/i)
+    should set_the_flash.to(/signed out/i)
     should_redirect_to_url_after_destroy
   end
 
@@ -127,7 +166,7 @@ class SessionsControllerTest < ActionController::TestCase
       delete :destroy
     end
 
-    should_set_the_flash_to(/signed out/i)
+    should set_the_flash.to(/signed out/i)
     should_redirect_to_url_after_destroy
 
     should "delete the cookie token" do

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,11 +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_display_a_sign_up_form
+      should respond_with(:success)
+      should render_template(:new)
+      should_not set_the_flash
     end
 
     context "on GET to #new with email" do
@@ -33,32 +31,37 @@ 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 assign_to(:user)
 
-      should "send the confirmation email" do
-        assert_sent_email do |email|
-          email.subject =~ /account confirmation/i
-        end
+      should "create a new user" do
+        assert_equal @old_user_count + 1, User.count
       end
 
-      should_set_the_flash_to /confirm/i
+      should have_sent_email.with_subject(/account confirmation/i)
+
+      should set_the_flash.to(/confirm/i)
       should_redirect_to_url_after_create
     end
   end
 
-  signed_in_user_context do
+  context "A signed-in user" do
+    setup do
+      @user = Factory(:email_confirmed_user)
+      sign_in_as @user
+    end
+
     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,6 +2,11 @@ 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
@@ -19,14 +24,14 @@ class UserTest < ActiveSupport::TestCase
       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
@@ -59,11 +64,7 @@ class UserTest < ActiveSupport::TestCase
       assert_equal "John.Doe@example.com", user.email
     end
 
-    should "send the confirmation email" do
-      assert_sent_email do |email|
-        email.subject =~ /account confirmation/i
-      end
-    end
+    should have_sent_email.with_subject(/account confirmation/i)
   end
 
   context "When signing up with email already confirmed" do
@@ -72,14 +73,12 @@ class UserTest < ActiveSupport::TestCase
       Factory(:user, :email_confirmed => true)
     end
 
-    should "not send the confirmation email" do
-      assert_did_not_send_email
-    end
+    should_not have_sent_email
   end
 
   context "When multiple users have signed up" do
     setup { Factory(:user) }
-    should_validate_uniqueness_of :email
+    should validate_uniqueness_of(:email)
   end
 
   # confirming email
@@ -239,7 +238,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
@@ -254,7 +254,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/Gemfile

@@ -0,0 +1,17 @@
+source 'http://rubygems.org'
+
+gem 'rails', '3.0.0'
+
+gem 'sqlite3-ruby', :require => 'sqlite3'
+
+gem 'capybara',           '0.3.9'
+gem 'cucumber',           '0.8.5'
+gem 'cucumber-rails',     '0.3.2'
+gem 'factory_girl_rails', '1.0'
+gem 'formtastic',         '1.1.0.beta'
+gem 'launchy',            '0.3.7'
+gem 'mocha',              '0.9.8'
+gem 'nokogiri',           '1.4.1'
+gem 'shoulda',            '2.11.3'
+
+gem 'clearance', :path => '../..'

data/test/rails_root/README

@@ -0,0 +1,244 @@
+== Welcome to Rails
+
+Rails is a web-application framework that includes everything needed to create 
+database-backed web applications according to the Model-View-Control pattern. 
+
+This pattern splits the view (also called the presentation) into "dumb" templates
+that are primarily responsible for inserting pre-built data in between HTML tags.
+The model contains the "smart" domain objects (such as Account, Product, Person,
+Post) that holds all the business logic and knows how to persist themselves to
+a database. The controller handles the incoming requests (such as Save New Account,
+Update Product, Show Post) by manipulating the model and directing data to the view.
+
+In Rails, the model is handled by what's called an object-relational mapping
+layer entitled Active Record. This layer allows you to present the data from
+database rows as objects and embellish these data objects with business logic
+methods. You can read more about Active Record in
+link:files/vendor/rails/activerecord/README.html.
+
+The controller and view are handled by the Action Pack, which handles both
+layers by its two parts: Action View and Action Controller. These two layers
+are bundled in a single package due to their heavy interdependence. This is
+unlike the relationship between the Active Record and Action Pack that is much
+more separate. Each of these packages can be used independently outside of
+Rails.  You can read more about Action Pack in
+link:files/vendor/rails/actionpack/README.html.
+
+
+== Getting Started
+
+1. At the command prompt, start a new Rails application using the <tt>rails</tt> command
+   and your application name. Ex: rails myapp
+2. Change directory into myapp and start the web server: <tt>rails server</tt> (run with --help for options)
+3. Go to http://localhost:3000/ and get "Welcome aboard: You're riding the Rails!"
+4. Follow the guidelines to start developing your application
+
+
+== Web Servers
+
+By default, Rails will try to use Mongrel if it's installed when started with <tt>rails server</tt>, otherwise
+Rails will use WEBrick, the webserver that ships with Ruby. But you can also use Rails
+with a variety of other web servers.
+
+Mongrel is a Ruby-based webserver with a C component (which requires compilation) that is
+suitable for development and deployment of Rails applications. If you have Ruby Gems installed,
+getting up and running with mongrel is as easy as: <tt>gem install mongrel</tt>.
+More info at: http://mongrel.rubyforge.org
+
+Say other Ruby web servers like Thin and Ebb or regular web servers like Apache or LiteSpeed or
+Lighttpd or IIS. The Ruby web servers are run through Rack and the latter can either be setup to use
+FCGI or proxy to a pack of Mongrels/Thin/Ebb servers.
+
+== Apache .htaccess example for FCGI/CGI
+
+# General Apache options
+AddHandler fastcgi-script .fcgi
+AddHandler cgi-script .cgi
+Options +FollowSymLinks +ExecCGI
+
+# If you don't want Rails to look in certain directories,
+# use the following rewrite rules so that Apache won't rewrite certain requests
+# 
+# Example:
+#   RewriteCond %{REQUEST_URI} ^/notrails.*
+#   RewriteRule .* - [L]
+
+# Redirect all requests not available on the filesystem to Rails
+# By default the cgi dispatcher is used which is very slow
+# 
+# For better performance replace the dispatcher with the fastcgi one
+#
+# Example:
+#   RewriteRule ^(.*)$ dispatch.fcgi [QSA,L]
+RewriteEngine On
+
+# If your Rails application is accessed via an Alias directive,
+# then you MUST also set the RewriteBase in this htaccess file.
+#
+# Example:
+#   Alias /myrailsapp /path/to/myrailsapp/public
+#   RewriteBase /myrailsapp
+
+RewriteRule ^$ index.html [QSA]
+RewriteRule ^([^.]+)$ $1.html [QSA]
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^(.*)$ dispatch.cgi [QSA,L]
+
+# In case Rails experiences terminal errors
+# Instead of displaying this message you can supply a file here which will be rendered instead
+# 
+# Example:
+#   ErrorDocument 500 /500.html
+
+ErrorDocument 500 "<h2>Application error</h2>Rails application failed to start properly"
+
+
+== Debugging Rails
+
+Sometimes your application goes wrong.  Fortunately there are a lot of tools that
+will help you debug it and get it back on the rails.
+
+First area to check is the application log files.  Have "tail -f" commands running
+on the server.log and development.log. Rails will automatically display debugging
+and runtime information to these files. Debugging info will also be shown in the
+browser on requests from 127.0.0.1.
+
+You can also log your own messages directly into the log file from your code using
+the Ruby logger class from inside your controllers. Example:
+
+  class WeblogController < ActionController::Base
+    def destroy
+      @weblog = Weblog.find(params[:id])
+      @weblog.destroy
+      logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!")
+    end
+  end
+
+The result will be a message in your log file along the lines of:
+
+  Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1
+
+More information on how to use the logger is at http://www.ruby-doc.org/core/
+
+Also, Ruby documentation can be found at http://www.ruby-lang.org/ including:
+
+* The Learning Ruby (Pickaxe) Book: http://www.ruby-doc.org/docs/ProgrammingRuby/
+* Learn to Program: http://pine.fm/LearnToProgram/  (a beginners guide)
+
+These two online (and free) books will bring you up to speed on the Ruby language
+and also on programming in general.
+
+
+== Debugger
+
+Debugger support is available through the debugger command when you start your Mongrel or
+Webrick server with --debugger. This means that you can break out of execution at any point
+in the code, investigate and change the model, AND then resume execution! 
+You need to install ruby-debug to run the server in debugging mode. With gems, use 'gem install ruby-debug'
+Example:
+
+  class WeblogController < ActionController::Base
+    def index
+      @posts = Post.find(:all)
+      debugger
+    end
+  end
+
+So the controller will accept the action, run the first line, then present you
+with a IRB prompt in the server window. Here you can do things like:
+
+  >> @posts.inspect
+  => "[#<Post:0x14a6be8 @attributes={\"title\"=>nil, \"body\"=>nil, \"id\"=>\"1\"}>,
+       #<Post:0x14a6620 @attributes={\"title\"=>\"Rails you know!\", \"body\"=>\"Only ten..\", \"id\"=>\"2\"}>]"
+  >> @posts.first.title = "hello from a debugger"
+  => "hello from a debugger"
+
+...and even better is that you can examine how your runtime objects actually work:
+
+  >> f = @posts.first
+  => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
+  >> f.
+  Display all 152 possibilities? (y or n)
+
+Finally, when you're ready to resume execution, you enter "cont"
+
+
+== Console
+
+You can interact with the domain model by starting the console through <tt>rails console</tt>.
+Here you'll have all parts of the application configured, just like it is when the
+application is running. You can inspect domain models, change values, and save to the
+database. Starting the script without arguments will launch it in the development environment.
+Passing an argument will specify a different environment, like <tt>rails console production</tt>.
+
+To reload your controllers and models after launching the console run <tt>reload!</tt>
+
+== dbconsole
+
+You can go to the command line of your database directly through <tt>rails dbconsole</tt>.
+You would be connected to the database with the credentials defined in database.yml.
+Starting the script without arguments will connect you to the development database. Passing an
+argument will connect you to a different database, like <tt>rails dbconsole production</tt>.
+Currently works for mysql, postgresql and sqlite.
+
+== Description of Contents
+
+app
+  Holds all the code that's specific to this particular application.
+
+app/controllers
+  Holds controllers that should be named like weblogs_controller.rb for
+  automated URL mapping. All controllers should descend from ApplicationController
+  which itself descends from ActionController::Base.
+
+app/models
+  Holds models that should be named like post.rb.
+  Most models will descend from ActiveRecord::Base.
+
+app/views
+  Holds the template files for the view that should be named like
+  weblogs/index.html.erb for the WeblogsController#index action. All views use eRuby
+  syntax.
+
+app/views/layouts
+  Holds the template files for layouts to be used with views. This models the common
+  header/footer method of wrapping views. In your views, define a layout using the
+  <tt>layout :default</tt> and create a file named default.html.erb. Inside default.html.erb,
+  call <% yield %> to render the view using this layout.
+
+app/helpers
+  Holds view helpers that should be named like weblogs_helper.rb. These are generated
+  for you automatically when using rails generate for controllers. Helpers can be used to
+  wrap functionality for your views into methods.
+
+config
+  Configuration files for the Rails environment, the routing map, the database, and other dependencies.
+
+db
+  Contains the database schema in schema.rb.  db/migrate contains all
+  the sequence of Migrations for your schema.
+
+doc
+  This directory is where your application documentation will be stored when generated
+  using <tt>rake doc:app</tt>
+
+lib
+  Application specific libraries. Basically, any kind of custom code that doesn't
+  belong under controllers, models, or helpers. This directory is in the load path.
+
+public
+  The directory available for the web server. Contains subdirectories for images, stylesheets,
+  and javascripts. Also contains the dispatchers and the default HTML files. This should be
+  set as the DOCUMENT_ROOT of your web server.
+
+script
+  Helper scripts for automation and generation.
+
+test
+  Unit and functional tests along with fixtures. When using the rails generate command, template
+  test files will be generated for you and placed in this directory.
+
+vendor
+  External libraries that the application depends on. Also includes the plugins subdirectory.
+  If the app has frozen rails, those gems also go here, under vendor/rails/.
+  This directory is in the load path.