tb_banners 1.2.1 → 1.3.beta1

data/spec/controllers/admin/banner_sets_controller_spec.rb

@@ -1,18 +1,18 @@
 require 'rails_helper'
 
-describe Admin::BannerSetsController, :type => 'controller' do
+describe Admin::BannerSetsController, type: 'controller' do
 
   before(:each) do
     activate_authlogic
-    u = SpudUser.new(:login => "testuser",:email => "test@testuser.com",:password => "test",:password_confirmation => "test")
+    u = SpudUser.new(login: 'testuser', email: 'test@testuser.com', password: 'test', password_confirmation: 'test')
     u.super_admin = true
     u.save
     @user = SpudUserSession.create(u)
   end
 
   describe 'index' do
-    it "should return an array of banner sets" do
-      5.times do |x| 
+    it 'should return an array of banner sets' do
+      5.times do |_x|
         banner_set = FactoryGirl.create(:spud_banner_set)
       end
       get :index
@@ -21,79 +21,79 @@ describe Admin::BannerSetsController, :type => 'controller' do
   end
 
   describe 'show' do
-    it "should respond with a banner set" do
+    it 'should respond with a banner set' do
       banner_set = FactoryGirl.create(:spud_banner_set)
-      get :show, :id => banner_set.id
+      get :show, params: { id: banner_set.id }
       expect(assigns(:banner_set)).to eq(banner_set)
       expect(response).to be_success
     end
 
-    it "should redirect if banner set is not found" do
-      get :show, :id => -1
+    it 'should redirect if banner set is not found' do
+      get :show, params: { id: -1 }
       expect(assigns(:banner_set)).to be_blank
       expect(response).to redirect_to admin_banner_sets_path
     end
   end
 
   describe 'new' do
-    it "should respond with a banner set" do
+    it 'should respond with a banner set' do
       get :new
       expect(response).to be_success
     end
   end
 
   describe 'create' do
-    it "should respond with a banner set" do
-      expect {
-        post :create, :spud_banner_set => FactoryGirl.attributes_for(:spud_banner_set)
-      }.to change(SpudBannerSet, :count).by(1)
+    it 'should respond with a banner set' do
+      expect do
+        post :create, params: { spud_banner_set: FactoryGirl.attributes_for(:spud_banner_set) }
+      end.to change(SpudBannerSet, :count).by(1)
       expect(response).to be_success
     end
 
-    it "should respond unsuccessfully if the banner set is invalid" do
-      expect {
-        post :create, :spud_banner_set => {:name => '', :width => 'lorem', :height => 'ipsum'}
-      }.to_not change(SpudBannerSet, :count)
+    it 'should respond unsuccessfully if the banner set is invalid' do
+      expect do
+        post :create, params: { spud_banner_set: { name: '', width: 'lorem', height: 'ipsum' } }
+      end.to_not change(SpudBannerSet, :count)
       assert_response 422
     end
   end
 
   describe 'edit' do
-    it "should respond with a banner set" do
+    it 'should respond with a banner set' do
       banner_set = FactoryGirl.create(:spud_banner_set)
-      get :edit, :id => banner_set.id
+      get :edit, params: { id: banner_set.id }
       expect(assigns(:banner_set)).to eq(banner_set)
       expect(response).to be_success
     end
   end
 
   describe 'update' do
-    it "should update the banner set" do
+    it 'should update the banner set' do
       banner_set = FactoryGirl.create(:spud_banner_set)
-      new_name = "Updated Set Name"
-      expect {
-        put :update, :id => banner_set.id, :spud_banner_set => {:name => new_name}
+      new_name = 'Updated Set Name'
+      expect do
+        put :update, params: { id: banner_set.id, spud_banner_set: { name: new_name } }
         banner_set.reload
-      }.to change(banner_set, :name).to(new_name)
+      end.to change(banner_set, :name).to(new_name)
     end
 
-    it "should respond unsuccessfully if the updated banner set is invalid" do
+    it 'should respond unsuccessfully if the updated banner set is invalid' do
       banner_set = FactoryGirl.create(:spud_banner_set)
-      expect {
-        put :update, :id => banner_set.id, :spud_banner_set => {:name => '', :width => 'lorem', :height => 'ipsum'}
-      }.to_not change(SpudBannerSet, :count)
+      expect do
+        put :update, params: { id: banner_set.id, spud_banner_set: { name: '', width: 'lorem', height: 'ipsum' } }
+      end.to_not change(SpudBannerSet, :count)
       assert_response 422
     end
   end
 
   describe 'destroy' do
-    it "should destroy the banner set and respond successfully" do
+    it 'should destroy the banner set and respond successfully' do
       banner_set = FactoryGirl.create(:spud_banner_set)
-      expect {
-        delete :destroy, :id => banner_set.id
-      }.to change(SpudBannerSet, :count).by(-1)
+      expect do
+        delete :destroy, params: { id: banner_set.id }
+      end.to change(SpudBannerSet, :count).by(-1)
       expect(response).to be_success
     end
   end
 
-end
+end

data/spec/dummy/config/application.rb

@@ -3,7 +3,7 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
 Bundler.require
-require "tb_banners"
+require 'tb_banners'
 
 module Dummy
   class Application < Rails::Application
@@ -31,7 +31,7 @@ module Dummy
     config.i18n.enforce_available_locales = true
 
     # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
+    config.encoding = 'utf-8'
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
@@ -51,4 +51,3 @@ module Dummy
     config.assets.version = '1.0'
   end
 end
-

data/spec/dummy/config/boot.rb

@@ -7,4 +7,4 @@ if File.exist?(gemfile)
   Bundler.setup
 end
 
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/environments/production.rb

@@ -9,7 +9,7 @@ Dummy::Application.configure do
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_files = false
+  config.public_file_server.enabled = false
 
   # Compress JavaScripts and CSS
   config.assets.compress = true

data/spec/dummy/config/environments/test.rb

@@ -8,8 +8,8 @@ Dummy::Application.configure do
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_files = true
-  config.static_cache_control = "public, max-age=3600"
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   # Deprecated
   # Log error messages when you accidentally call methods on nil
@@ -20,7 +20,6 @@ Dummy::Application.configure do
   # preloads Rails for running tests, you may have to set it to true.
   config.eager_load = false
 
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
@@ -29,7 +28,7 @@ Dummy::Application.configure do
   config.action_dispatch.show_exceptions = false
 
   # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
@@ -42,6 +41,4 @@ Dummy::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
-
-  config.active_record.raise_in_transactional_callbacks = true
 end

data/spec/dummy/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 run Dummy::Application

data/spec/dummy/db/migrate/20121127192247_create_spud_users.spud_core.rb

@@ -2,21 +2,21 @@
 class CreateSpudUsers < ActiveRecord::Migration
   def change
     create_table :spud_users do |t|
-      
+
       t.string :first_name
       t.string :last_name
       t.boolean :super_admin
-      t.string    :login,               :null => false                # optional, you can use email instead, or both
-      t.string    :email,               :null => false                # optional, you can use login instead, or both
-      t.string    :crypted_password,    :null => false                # optional, see below
-      t.string    :password_salt,       :null => false                # optional, but highly recommended
-      t.string    :persistence_token,   :null => false                # required
-      t.string    :single_access_token, :null => false                # optional, see Authlogic::Session::Params
-      t.string    :perishable_token,    :null => false                # optional, see Authlogic::Session::Perishability
+      t.string    :login,               null: false                # optional, you can use email instead, or both
+      t.string    :email,               null: false                # optional, you can use login instead, or both
+      t.string    :crypted_password,    null: false                # optional, see below
+      t.string    :password_salt,       null: false                # optional, but highly recommended
+      t.string    :persistence_token,   null: false                # required
+      t.string    :single_access_token, null: false                # optional, see Authlogic::Session::Params
+      t.string    :perishable_token,    null: false                # optional, see Authlogic::Session::Perishability
 
       # Magic columns, just like ActiveRecord's created_at and updated_at. These are automatically maintained by Authlogic if they are present.
-      t.integer   :login_count,         :null => false, :default => 0 # optional, see Authlogic::Session::MagicColumns
-      t.integer   :failed_login_count,  :null => false, :default => 0 # optional, see Authlogic::Session::MagicColumns
+      t.integer   :login_count,         null: false, default: 0 # optional, see Authlogic::Session::MagicColumns
+      t.integer   :failed_login_count,  null: false, default: 0 # optional, see Authlogic::Session::MagicColumns
       t.datetime  :last_request_at                                    # optional, see Authlogic::Session::MagicColumns
       t.datetime  :current_login_at                                   # optional, see Authlogic::Session::MagicColumns
       t.datetime  :last_login_at                                      # optional, see Authlogic::Session::MagicColumns
@@ -24,7 +24,7 @@ class CreateSpudUsers < ActiveRecord::Migration
       t.string    :last_login_ip                                      # optional, see Authlogic::Session::MagicColumns
       t.timestamps
     end
-    add_index :spud_users,:login
-    add_index :spud_users,:email
+    add_index :spud_users, :login
+    add_index :spud_users, :email
   end
 end

data/spec/dummy/db/migrate/20121127192248_add_time_zone_to_spud_user.spud_core.rb

@@ -2,6 +2,5 @@
 class AddTimeZoneToSpudUser < ActiveRecord::Migration
   def change
     add_column :spud_users, :time_zone, :string
-
   end
 end

data/spec/dummy/db/migrate/20121127192249_add_scope_to_spud_admin_permissions.spud_core.rb

@@ -2,6 +2,5 @@
 class AddScopeToSpudAdminPermissions < ActiveRecord::Migration
   def change
     add_column :spud_admin_permissions, :scope, :string
-
   end
 end

data/spec/dummy/db/migrate/20130920154443_create_spud_permissions.tb_core.rb

@@ -2,10 +2,10 @@
 class CreateSpudPermissions < ActiveRecord::Migration
   def change
     create_table :spud_permissions do |t|
-      t.string :name, :null => false
-      t.string :tag, :null => false
+      t.string :name, null: false
+      t.string :tag, null: false
       t.timestamps
     end
-    add_index :spud_permissions, :tag, :unique => true
+    add_index :spud_permissions, :tag, unique: true
   end
 end

data/spec/dummy/db/migrate/20130920154444_create_spud_role_permissions.tb_core.rb

@@ -2,8 +2,8 @@
 class CreateSpudRolePermissions < ActiveRecord::Migration
   def change
     create_table :spud_role_permissions do |t|
-      t.integer :spud_role_id, :null => false
-      t.string :spud_permission_tag, :null => false
+      t.integer :spud_role_id, null: false
+      t.string :spud_permission_tag, null: false
       t.timestamps
     end
     add_index :spud_role_permissions, :spud_role_id

data/spec/dummy/db/migrate/20130920154446_create_spud_banners.tb_banners.rb

@@ -2,15 +2,15 @@
 class CreateSpudBanners < ActiveRecord::Migration
   def change
     create_table :spud_banners do |t|
-      t.integer :spud_banner_set_id, :null => false
+      t.integer :spud_banner_set_id, null: false
       t.string :link_to
-      t.string :link_target, :default => '_self'
+      t.string :link_target, default: '_self'
       t.string :title
       t.string :alt
-      t.integer :sort_order, :default => 0
+      t.integer :sort_order, default: 0
       t.attachment :banner
       t.timestamps
     end
-    add_index :spud_banners, :spud_banner_set_id, :unique => false
+    add_index :spud_banners, :spud_banner_set_id, unique: false
   end
 end

data/spec/dummy/db/migrate/20130920154447_create_spud_banner_sets.tb_banners.rb

@@ -2,12 +2,12 @@
 class CreateSpudBannerSets < ActiveRecord::Migration
   def change
     create_table :spud_banner_sets do |t|
-      t.string :name, :null => false
-      t.integer :width, :null => false
-      t.integer :height, :null => false
-      t.boolean :cropped, :default => true
+      t.string :name, null: false
+      t.integer :width, null: false
+      t.integer :height, null: false
+      t.boolean :cropped, default: true
       t.timestamps
     end
-    add_index :spud_banner_sets, :name, :unique => true
+    add_index :spud_banner_sets, :name, unique: true
   end
 end

data/spec/dummy/db/migrate/20130920154448_add_rich_text_to_spud_banners.tb_banners.rb

@@ -1,7 +1,7 @@
 # This migration comes from tb_banners (originally 20130614132846)
 class AddRichTextToSpudBanners < ActiveRecord::Migration
   def change
-    add_column :spud_banner_sets, :has_rich_text, :boolean, :default => false
+    add_column :spud_banner_sets, :has_rich_text, :boolean, default: false
     add_column :spud_banners, :rich_text, :text
   end
 end

data/spec/dummy/db/migrate/20160310164644_add_requires_password_change_to_spud_users.tb_core.rb

@@ -1,6 +1,6 @@
 # This migration comes from tb_core (originally 20150610143438)
 class AddRequiresPasswordChangeToSpudUsers < ActiveRecord::Migration
   def change
-    add_column :spud_users, :requires_password_change, :boolean, :default => false
+    add_column :spud_users, :requires_password_change, :boolean, default: false
   end
 end

data/spec/dummy/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -11,111 +10,105 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160310164644) do
-
-  create_table "spud_banner_sets", force: :cascade do |t|
-    t.string   "name",          limit: 255,                 null: false
-    t.integer  "width",         limit: 4,                   null: false
-    t.integer  "height",        limit: 4,                   null: false
-    t.boolean  "cropped",                   default: true
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.boolean  "has_rich_text",             default: false
+ActiveRecord::Schema.define(version: 20_160_310_164_644) do
+
+  create_table 'spud_banner_sets', force: :cascade, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8' do |t|
+    t.string   'name',                          null: false
+    t.integer  'width',                         null: false
+    t.integer  'height',                        null: false
+    t.boolean  'cropped', default: true
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
+    t.boolean  'has_rich_text', default: false
+    t.index ['name'], name: 'index_spud_banner_sets_on_name', unique: true, using: :btree
   end
 
-  add_index "spud_banner_sets", ["name"], name: "index_spud_banner_sets_on_name", unique: true, using: :btree
-
-  create_table "spud_banners", force: :cascade do |t|
-    t.integer  "spud_banner_set_id",  limit: 4,                       null: false
-    t.string   "link_to",             limit: 255
-    t.string   "link_target",         limit: 255,   default: "_self"
-    t.string   "title",               limit: 255
-    t.string   "alt",                 limit: 255
-    t.integer  "sort_order",          limit: 4,     default: 0
-    t.string   "banner_file_name",    limit: 255
-    t.string   "banner_content_type", limit: 255
-    t.integer  "banner_file_size",    limit: 4
-    t.datetime "banner_updated_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.text     "rich_text",           limit: 65535
-    t.date     "start_date"
-    t.date     "end_date"
+  create_table 'spud_banners', force: :cascade, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8' do |t|
+    t.integer  'spud_banner_set_id',                                  null: false
+    t.string   'link_to'
+    t.string   'link_target', default: '_self'
+    t.string   'title'
+    t.string   'alt'
+    t.integer  'sort_order', default: 0
+    t.string   'banner_file_name'
+    t.string   'banner_content_type'
+    t.integer  'banner_file_size'
+    t.datetime 'banner_updated_at'
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
+    t.text     'rich_text', limit: 65_535
+    t.date     'start_date'
+    t.date     'end_date'
+    t.index ['spud_banner_set_id'], name: 'index_spud_banners_on_spud_banner_set_id', using: :btree
   end
 
-  add_index "spud_banners", ["spud_banner_set_id"], name: "index_spud_banners_on_spud_banner_set_id", using: :btree
-
-  create_table "spud_liquid_tags", force: :cascade do |t|
-    t.integer  "attachment_id",   limit: 4
-    t.string   "attachment_type", limit: 255
-    t.string   "tag_name",        limit: 255
-    t.string   "value",           limit: 255
-    t.datetime "created_at"
-    t.datetime "updated_at"
+  create_table 'spud_liquid_tags', force: :cascade, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8' do |t|
+    t.integer  'attachment_id'
+    t.string   'attachment_type'
+    t.string   'tag_name'
+    t.string   'value'
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
+    t.index ['tag_name', 'value'], name: 'index_spud_liquid_tags_on_tag_name_and_value', using: :btree
   end
 
-  add_index "spud_liquid_tags", ["tag_name", "value"], name: "index_spud_liquid_tags_on_tag_name_and_value", using: :btree
-
-  create_table "spud_permissions", force: :cascade do |t|
-    t.string   "name",       limit: 255, null: false
-    t.string   "tag",        limit: 255, null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+  create_table 'spud_permissions', force: :cascade, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8' do |t|
+    t.string   'name',       null: false
+    t.string   'tag',        null: false
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
+    t.index ['tag'], name: 'index_spud_permissions_on_tag', unique: true, using: :btree
   end
 
-  add_index "spud_permissions", ["tag"], name: "index_spud_permissions_on_tag", unique: true, using: :btree
-
-  create_table "spud_role_permissions", force: :cascade do |t|
-    t.integer  "spud_role_id",        limit: 4,   null: false
-    t.string   "spud_permission_tag", limit: 255, null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+  create_table 'spud_role_permissions', force: :cascade, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8' do |t|
+    t.integer  'spud_role_id',        null: false
+    t.string   'spud_permission_tag', null: false
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
+    t.index ['spud_permission_tag'], name: 'index_spud_role_permissions_on_spud_permission_tag', using: :btree
+    t.index ['spud_role_id'], name: 'index_spud_role_permissions_on_spud_role_id', using: :btree
   end
 
-  add_index "spud_role_permissions", ["spud_permission_tag"], name: "index_spud_role_permissions_on_spud_permission_tag", using: :btree
-  add_index "spud_role_permissions", ["spud_role_id"], name: "index_spud_role_permissions_on_spud_role_id", using: :btree
-
-  create_table "spud_roles", force: :cascade do |t|
-    t.string   "name",       limit: 255
-    t.datetime "created_at"
-    t.datetime "updated_at"
+  create_table 'spud_roles', force: :cascade, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8' do |t|
+    t.string   'name'
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
   end
 
-  create_table "spud_user_settings", force: :cascade do |t|
-    t.integer  "spud_user_id", limit: 4
-    t.string   "key",          limit: 255
-    t.string   "value",        limit: 255
-    t.datetime "created_at"
-    t.datetime "updated_at"
+  create_table 'spud_user_settings', force: :cascade, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8' do |t|
+    t.integer  'spud_user_id'
+    t.string   'key'
+    t.string   'value'
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
   end
 
-  create_table "spud_users", force: :cascade do |t|
-    t.string   "first_name",               limit: 255
-    t.string   "last_name",                limit: 255
-    t.boolean  "super_admin"
-    t.string   "login",                    limit: 255,                 null: false
-    t.string   "email",                    limit: 255,                 null: false
-    t.string   "crypted_password",         limit: 255,                 null: false
-    t.string   "password_salt",            limit: 255,                 null: false
-    t.string   "persistence_token",        limit: 255,                 null: false
-    t.string   "single_access_token",      limit: 255,                 null: false
-    t.string   "perishable_token",         limit: 255,                 null: false
-    t.integer  "login_count",              limit: 4,   default: 0,     null: false
-    t.integer  "failed_login_count",       limit: 4,   default: 0,     null: false
-    t.datetime "last_request_at"
-    t.datetime "current_login_at"
-    t.datetime "last_login_at"
-    t.string   "current_login_ip",         limit: 255
-    t.string   "last_login_ip",            limit: 255
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "time_zone",                limit: 255
-    t.integer  "spud_role_id",             limit: 4
-    t.boolean  "requires_password_change",             default: false
+  create_table 'spud_users', force: :cascade, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8' do |t|
+    t.string   'first_name'
+    t.string   'last_name'
+    t.boolean  'super_admin'
+    t.string   'login',                                    null: false
+    t.string   'email',                                    null: false
+    t.string   'crypted_password',                         null: false
+    t.string   'password_salt',                            null: false
+    t.string   'persistence_token',                        null: false
+    t.string   'single_access_token',                      null: false
+    t.string   'perishable_token',                         null: false
+    t.integer  'login_count',              default: 0,     null: false
+    t.integer  'failed_login_count',       default: 0,     null: false
+    t.datetime 'last_request_at'
+    t.datetime 'current_login_at'
+    t.datetime 'last_login_at'
+    t.string   'current_login_ip'
+    t.string   'last_login_ip'
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
+    t.string   'time_zone'
+    t.integer  'spud_role_id'
+    t.boolean  'requires_password_change', default: false
+    t.index ['email'], name: 'index_spud_users_on_email', using: :btree
+    t.index ['login'], name: 'index_spud_users_on_login', using: :btree
+    t.index ['spud_role_id'], name: 'index_spud_users_on_spud_role_id', using: :btree
   end
 
-  add_index "spud_users", ["email"], name: "index_spud_users_on_email", using: :btree
-  add_index "spud_users", ["login"], name: "index_spud_users_on_login", using: :btree
-  add_index "spud_users", ["spud_role_id"], name: "index_spud_users_on_spud_role_id", using: :btree
-
 end

data/spec/dummy/script/rails

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require File.expand_path('../../config/boot', __FILE__)
 require 'rails/commands'

data/spec/rails_helper.rb

@@ -1,10 +1,11 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
-ENV["RAILS_ENV"] ||= 'test'
+ENV['RAILS_ENV'] ||= 'test'
 
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require File.expand_path('../dummy/config/environment.rb', __FILE__)
 require 'spec_helper'
 require 'authlogic_helper'
 require 'rspec/rails'
+require 'rails-controller-testing'
 require 'database_cleaner'
 require 'simplecov'
 require 'factory_girl_rails'
@@ -30,12 +31,18 @@ SimpleCov.start 'rails'
 
 # Checks for pending migrations before tests are run.
 # If you are not using ActiveRecord, you can remove this line.
-#ActiveRecord::Migration.maintain_test_schema!
+# ActiveRecord::Migration.maintain_test_schema!
 
 RSpec.configure do |config|
+  [:controller, :view, :request].each do |type|
+    config.include ::Rails::Controller::Testing::TestProcess, type: type
+    config.include ::Rails::Controller::Testing::TemplateAssertions, type: type
+    config.include ::Rails::Controller::Testing::Integration, type: type
+  end
+
   config.raise_errors_for_deprecations!
   config.infer_base_class_for_anonymous_controllers = false
-  
+
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
   # instead of true.
@@ -67,5 +74,5 @@ RSpec.configure do |config|
       example.run
     end
   end
-  
+
 end