thoughtbot-clearance 0.2.5 → 0.2.6

data/lib/clearance/version.rb

@@ -1,7 +1,7 @@
-class Clearance
+module Clearance
   module Version
     MAJOR = 0
     MINOR = 2
-    PATCH = 5
+    PATCH = 6
   end
 end

data/test/rails_root/app/controllers/application.rb

@@ -1,5 +1,5 @@
 class ApplicationController < ActionController::Base
   helper :all
   protect_from_forgery
-  include Clearance::ApplicationController
+  include Clearance::App::Controllers::ApplicationController
 end

data/test/rails_root/app/controllers/confirmations_controller.rb

@@ -1,3 +1,3 @@
 class ConfirmationsController < ApplicationController
-  include Clearance::ConfirmationsController
+  include Clearance::App::Controllers::ConfirmationsController
 end

data/test/rails_root/app/controllers/passwords_controller.rb

@@ -1,3 +1,3 @@
 class PasswordsController < ApplicationController
-  include Clearance::PasswordsController
+  include Clearance::App::Controllers::PasswordsController
 end

data/test/rails_root/app/controllers/sessions_controller.rb

@@ -1,3 +1,3 @@
 class SessionsController < ApplicationController
-  include Clearance::SessionsController
+  include Clearance::App::Controllers::SessionsController
 end

data/test/rails_root/app/controllers/users_controller.rb

@@ -1,3 +1,3 @@
 class UsersController < ApplicationController
-  include Clearance::UsersController
+  include Clearance::App::Controllers::UsersController
 end

data/test/rails_root/app/models/user.rb

@@ -1,3 +1,3 @@
 class User < ActiveRecord::Base
-  include Clearance::Models::User
+  include Clearance::App::Models::User
 end

data/test/rails_root/app/models/user_mailer.rb

@@ -2,6 +2,6 @@ class UserMailer < ActionMailer::Base
   
   default_url_options[:host] = HOST
   
-  include Clearance::Mailers::User
+  include Clearance::App::Models::UserMailer
 
 end

data/test/rails_root/test/functional/confirmations_controller_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class ConfirmationsControllerTest < ActionController::TestCase
-  include Clearance::ConfirmationsControllerTest
+  include Clearance::Test::Functional::ConfirmationsControllerTest
 end

data/test/rails_root/test/functional/passwords_controller_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class PasswordsControllerTest < ActionController::TestCase
-  include Clearance::PasswordsControllerTest
+  include Clearance::Test::Functional::PasswordsControllerTest
 end

data/test/rails_root/test/functional/sessions_controller_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class SessionsControllerTest < ActionController::TestCase
-  include Clearance::SessionsControllerTest
+  include Clearance::Test::Functional::SessionsControllerTest
 end

data/test/rails_root/test/functional/users_controller_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class UsersControllerTest < ActionController::TestCase
-  include Clearance::UsersControllerTest
+  include Clearance::Test::Functional::UsersControllerTest
 end

data/test/rails_root/test/test_helper.rb

@@ -22,6 +22,6 @@ class Test::Unit::TestCase
   self.backtrace_silencers << :rails_vendor
   self.backtrace_filters   << :rails_root
   
-  include Clearance::TestHelper
+  include Clearance::Test::TestHelper
   
 end

data/test/rails_root/test/unit/user_mailer_test.rb

@@ -2,5 +2,5 @@ require File.dirname(__FILE__) + '/../test_helper'
 
 class UserMailerTest < ActionMailer::TestCase
   tests UserMailer
-  include Clearance::UserMailerTest
+  include Clearance::Test::Unit::UserMailerTest
 end

data/test/rails_root/test/unit/user_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class UserTest < Test::Unit::TestCase
-  include Clearance::UserTest
+  include Clearance::Test::Unit::UserTest
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thoughtbot-clearance
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -142,10 +142,8 @@ files:
 - test/rails_root/config/routes.rb
 - test/rails_root/db
 - test/rails_root/db/bootstrap
-- test/rails_root/db/development.sqlite3
 - test/rails_root/db/migrate
 - test/rails_root/db/migrate/001_create_users.rb
-- test/rails_root/db/schema.rb
 - test/rails_root/db/test.sqlite3
 - test/rails_root/doc
 - test/rails_root/doc/README_FOR_APP
@@ -200,8 +198,6 @@ files:
 - test/rails_root/script/server
 - test/rails_root/test
 - test/rails_root/test/factories.rb
-- test/rails_root/test/fixtures
-- test/rails_root/test/fixtures/mailer
 - test/rails_root/test/functional
 - test/rails_root/test/functional/confirmations_controller_test.rb
 - test/rails_root/test/functional/passwords_controller_test.rb
@@ -215,11 +211,6 @@ files:
 - test/rails_root/test/unit
 - test/rails_root/test/unit/user_mailer_test.rb
 - test/rails_root/test/unit/user_test.rb
-- test/rails_root/tmp
-- test/rails_root/tmp/cache
-- test/rails_root/tmp/pids
-- test/rails_root/tmp/sessions
-- test/rails_root/tmp/sockets
 - test/rails_root/vendor
 - test/rails_root/vendor/gems
 - test/rails_root/vendor/gems/mocha-0.9.1
@@ -541,6 +532,39 @@ files:
 - test/rails_root/vendor/plugins/factory_girl_on_rails/rails_generators/factory/templates/unit_test.rb
 - test/rails_root/vendor/plugins/factory_girl_on_rails/rails_generators/factory/USAGE
 - test/rails_root/vendor/plugins/factory_girl_on_rails/README
+- test/rails_root/vendor/plugins/shoulda
+- test/rails_root/vendor/plugins/shoulda/bin
+- test/rails_root/vendor/plugins/shoulda/lib
+- test/rails_root/vendor/plugins/shoulda/lib/shoulda
+- test/rails_root/vendor/plugins/shoulda/lib/shoulda/action_mailer
+- test/rails_root/vendor/plugins/shoulda/lib/shoulda/active_record
+- test/rails_root/vendor/plugins/shoulda/lib/shoulda/controller
+- test/rails_root/vendor/plugins/shoulda/lib/shoulda/controller/formats
+- test/rails_root/vendor/plugins/shoulda/tasks
+- test/rails_root/vendor/plugins/shoulda/test
+- test/rails_root/vendor/plugins/shoulda/test/fixtures
+- test/rails_root/vendor/plugins/shoulda/test/functional
+- test/rails_root/vendor/plugins/shoulda/test/other
+- test/rails_root/vendor/plugins/shoulda/test/rails_root
+- test/rails_root/vendor/plugins/shoulda/test/rails_root/app
+- test/rails_root/vendor/plugins/shoulda/test/rails_root/app/controllers
+- test/rails_root/vendor/plugins/shoulda/test/rails_root/app/helpers
+- test/rails_root/vendor/plugins/shoulda/test/rails_root/app/models
+- test/rails_root/vendor/plugins/shoulda/test/rails_root/app/views
+- test/rails_root/vendor/plugins/shoulda/test/rails_root/app/views/layouts
+- test/rails_root/vendor/plugins/shoulda/test/rails_root/app/views/posts
+- test/rails_root/vendor/plugins/shoulda/test/rails_root/app/views/users
+- test/rails_root/vendor/plugins/shoulda/test/rails_root/config
+- test/rails_root/vendor/plugins/shoulda/test/rails_root/config/environments
+- test/rails_root/vendor/plugins/shoulda/test/rails_root/config/initializers
+- test/rails_root/vendor/plugins/shoulda/test/rails_root/db
+- test/rails_root/vendor/plugins/shoulda/test/rails_root/db/migrate
+- test/rails_root/vendor/plugins/shoulda/test/rails_root/log
+- test/rails_root/vendor/plugins/shoulda/test/rails_root/public
+- test/rails_root/vendor/plugins/shoulda/test/rails_root/script
+- test/rails_root/vendor/plugins/shoulda/test/rails_root/vendor
+- test/rails_root/vendor/plugins/shoulda/test/rails_root/vendor/plugins
+- test/rails_root/vendor/plugins/shoulda/test/unit
 has_rdoc: false
 homepage: http://github.com/thoughtbot/clearance
 post_install_message: 

data/lib/clearance/test/functionals/confirmations_controller_test.rb

@@ -1,81 +0,0 @@
-module Clearance
-  module ConfirmationsControllerTest
-
-    def self.included(base)
-      base.class_eval do
-
-        context 'A GET to #new' do
-          context "with the User with the given id's salt" do
-            setup do
-              @user = Factory :user
-              get :new, :user_id => @user.id, :salt => @user.salt
-            end
-
-            should 'find the User record with the given id and salt' do
-              assert_equal @user, assigns(:user)
-            end
-
-            should_respond_with :success
-            should_render_template :new
-          end
-
-          context "without the User with the given id's salt" do
-            setup do
-              user = Factory :user
-              salt = ''
-              assert_not_equal salt, user.salt
-
-              get :new, :user_id => user.id, :salt => ''
-            end
-
-            should_respond_with :not_found
-
-            should 'render nothing' do
-              assert @response.body.blank?
-            end
-          end
-        end
-
-        context 'A POST to #create' do
-          context "with the User with the given id's salt" do
-            setup do
-              @user = Factory :user
-              assert ! @user.confirmed?
-
-              post :create, :user_id => @user, :salt => @user.salt
-              @user.reload
-            end
-
-            should 'confirm the User record with the given id' do
-              assert @user.confirmed?
-            end
-
-            should 'log the User in' do
-              assert_equal @user.id, session[:user_id]
-            end
-
-            should_redirect_to "user_path(@user)"
-          end
-
-          context "without the User with the given id's salt" do
-            setup do
-              user = Factory :user
-              salt = ''
-              assert_not_equal salt, user.salt
-
-              post :create, :user_id => user.id, :salt => salt
-            end
-
-            should_respond_with :not_found
-
-            should 'render nothing' do
-              assert @response.body.blank?
-            end
-          end
-        end
-
-      end
-    end
-
-  end
-end

data/lib/clearance/test/functionals/passwords_controller_test.rb

@@ -1,188 +0,0 @@
-module Clearance
-  module PasswordsControllerTest
-
-    def self.included(base)
-      base.class_eval do
-
-        should_route :get, '/users/1/password/edit', :action => 'edit', :user_id => '1'
-
-        context 'with a user' do
-          setup { @user = Factory :user }
-
-          context 'A GET to #new' do
-            setup { get :new, :user_id => @user_id }
-
-            should_respond_with :success
-            should_render_template 'new'
-          end
-
-          context 'A POST to #create' do
-            context "with an existing user's email address" do
-              setup do
-                ActionMailer::Base.deliveries.clear
-
-                post :create, :password => { :email => @user.email }
-                @email = ActionMailer::Base.deliveries[0]
-              end
-
-              should 'send an email to the user to edit their password' do
-                assert @email.subject =~ /request to change your password/i
-              end
-
-              should_redirect_to "new_session_path"
-            end
-
-            context 'with a non-existing email address' do
-              setup do
-                email = 'user1@example.com'
-                assert ! User.exists?(['email = ?', email])
-                ActionMailer::Base.deliveries.clear
-
-                post :create, :password => { :email => email }
-              end
-
-              should 'not send a password reminder email' do
-                assert ActionMailer::Base.deliveries.empty?
-              end
-
-              should 'set a :warning flash' do
-                assert_not_nil flash.now[:warning]
-              end
-
-              should_render_template "new"
-            end
-          end
-
-          context 'A GET to #edit' do
-            context "with an existing user's id and password" do
-              setup do
-                get :edit, 
-                  :user_id => @user.id, 
-                  :password => @user.crypted_password, 
-                  :email => @user.email
-              end
-
-              should 'find the user with the given id and password' do
-                assert_equal @user, assigns(:user)
-              end
-
-              should_respond_with :success
-              should_render_template "edit"
-
-              should "have a form for the user's email, password, and password confirm" do
-                update_path = ERB::Util.h(user_password_path(@user,
-                      :password => @user.crypted_password,
-                      :email    => @user.email))
-
-                assert_select 'form[action=?]', update_path do
-                  assert_select 'input[name=_method][value=?]', 'put'
-                  assert_select 'input[name=?]', 'user[password]'
-                  assert_select 'input[name=?]', 'user[password_confirmation]'
-                end
-              end
-            end
-
-            context "with an existing user's id but not password" do
-              setup do
-                get(:edit,
-                    :user_id => @user.id,
-                    :password => '')
-              end
-
-              should_respond_with :not_found
-
-              should 'render an empty response' do
-                assert @response.body.blank?
-              end
-            end
-          end
-
-          context 'A PUT to #update' do
-            context "with an existing user's id but not password" do
-              setup do
-                put(:update,
-                    :user_id => @user.id,
-                    :password => '')
-              end
-
-              should "not update the user's password" do
-                assert_not_equal @encrypted_new_password, @user.crypted_password
-              end
-
-              should 'not log the user in' do
-                assert_nil session[:user_id]
-              end
-
-              should_respond_with :not_found
-
-              should 'render an empty response' do
-                assert @response.body.blank?
-              end
-            end
-
-            context 'with a matching password and password confirmation' do
-              setup do
-                new_password = 'new_password'
-                encryption_format = "--#{@user.salt}--#{new_password}--"
-                @encrypted_new_password = Digest::SHA1.hexdigest encryption_format
-                assert_not_equal @encrypted_new_password, @user.crypted_password
-
-                put(:update,
-                    :user_id  => @user,
-                    :email    => @user.email,
-                    :password => @user.crypted_password,
-                    :user => {
-                      :password              => new_password,
-                      :password_confirmation => new_password
-                    })
-                @user.reload
-              end
-
-              should "update the user's password" do
-                assert_equal @encrypted_new_password, @user.crypted_password
-              end
-
-              should 'log the user in' do
-                assert_equal session[:user_id], @user.id
-              end
-
-              should_redirect_to "user_path(@user)"
-            end
-
-            context 'with password but blank password confirmation' do
-              setup do
-                new_password = 'new_password'
-                encryption_format = "--#{@user.salt}--#{new_password}--"
-                @encrypted_new_password = Digest::SHA1.hexdigest encryption_format
-
-                put(:update,
-                    :user_id => @user.id,
-                    :password => @user.crypted_password,
-                    :user => {
-                      :password => new_password,
-                      :password_confirmation => ''
-                    })
-                @user.reload
-              end
-
-              should "not update the user's password" do
-                assert_not_equal @encrypted_new_password, @user.crypted_password
-              end
-
-              should 'not log the user in' do
-                assert_nil session[:user_id]
-              end
-
-              should_respond_with :not_found
-
-              should 'render an empty response' do
-                assert @response.body.blank?
-              end
-            end
-          end
-        end
-      end
-    end
-
-  end
-end