tb_core 1.3.10 → 1.4.beta1

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,68 +10,68 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150610180845) do
+ActiveRecord::Schema.define(version: 20150610143438) do
 
-  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"
-  end
-
-  add_index "spud_permissions", ["tag"], name: "index_spud_permissions_on_tag", unique: true, using: :btree
+  # These are extensions that must be enabled in order to support this database
+  enable_extension 'plpgsql'
 
-  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_permissions', force: :cascade 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_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_role_permissions', force: :cascade 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
 
-  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_roles', force: :cascade do |t|
+    t.string   'name'
+    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",              limit: 1
-    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", limit: 1,   default: false
+  create_table 'spud_user_settings', force: :cascade do |t|
+    t.integer  'spud_user_id'
+    t.string   'key'
+    t.string   'value'
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
   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
+  create_table 'spud_users', force: :cascade 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
 
 end

data/spec/factories/spud_user_factories.rb

@@ -24,8 +24,8 @@ FactoryGirl.define do
     last_name { FactoryGirl.generate(:last_name) }
     login { FactoryGirl.generate(:login) }
     email { FactoryGirl.generate(:email) }
-    password "password"
-    password_confirmation "password"
+    password 'password'
+    password_confirmation 'password'
     single_access_token { FactoryGirl.generate(:single_access_token) }
   end
 end

data/spec/helpers/spud/admin/application_helper_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe Admin::ApplicationHelper, :type => :helper do
+describe Admin::ApplicationHelper, type: :helper do
   describe '#timestamp' do
     it "should return 'Never' if a timedate is not given" do
       expect(timestamp).to eq('Never')
@@ -29,12 +29,12 @@ describe Admin::ApplicationHelper, :type => :helper do
       @user = FactoryGirl.create(:spud_user)
     end
 
-    it "should return blank when no errors exist" do
+    it 'should return blank when no errors exist' do
       expect(helper.tb_form_errors(@user)).to be_blank
     end
 
-    it "should display the error" do
-      error = "You're invalid"
+    it 'should display the error' do
+      error = 'Invalid!'
       @user.errors[:base] << error
       expect(helper.tb_form_errors(@user)).to include(error)
     end

data/spec/lib/spud_core/configuration_spec.rb

@@ -5,8 +5,8 @@ describe Spud::Core do
   before :each do
     Spud::Core.configure do |config|
       config.site_id = 0
-      config.site_name = "Default Site"
-      config.short_name = "default"
+      config.site_name = 'Default Site'
+      config.short_name = 'default'
     end
   end
 

data/spec/lib/tb_core/belongs_to_app_spec.rb

@@ -23,7 +23,7 @@ describe TbCore::BelongsToApp do
 
   describe '#acts_as_app' do
     it 'should configure the app' do
-      controller.current_user = FactoryGirl.create(:spud_user, :super_admin => true)
+      controller.current_user = FactoryGirl.create(:spud_user, super_admin: true)
       controller.send(:act_as_app, :users)
       expect(controller.instance_variable_get('@page_application')).to be_a(Hash)
     end
@@ -31,11 +31,11 @@ describe TbCore::BelongsToApp do
     it 'should raise an error if the app cannot be found' do
       expect{
         controller.send(:act_as_app, :fail)
-      }.to raise_error
+      }.to raise_error(StandardError)
     end
-    
+
     it 'should raise an error if the user does not have access' do
-      controller.current_user = FactoryGirl.create(:spud_user, :super_admin => false)
+      controller.current_user = FactoryGirl.create(:spud_user, super_admin: false)
       expect{
         controller.send(:act_as_app, :users)
       }.to raise_error(Spud::AccessDeniedError)

data/spec/models/spud_role_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe SpudRole, :type => :model do
+describe SpudRole, type: :model do
 
 	before :each do
 		@role = FactoryGirl.build(:spud_role)
@@ -11,15 +11,15 @@ describe SpudRole, :type => :model do
 		@role.save()
 	end
 
-	describe "permissions" do
-		it "should return an array of SpudPermission objects" do
+	describe 'permissions' do
+		it 'should return an array of SpudPermission objects' do
 			expect(@role.permissions).to be_an_instance_of(Array)
 			expect(@role.permissions.first).to be_an_instance_of(SpudPermission)
 		end
 	end
 
-	describe "permissions=" do
-		it "should update the SpudRolePermissions on the role" do
+	describe 'permissions=' do
+		it 'should update the SpudRolePermissions on the role' do
 			original_count = @role.spud_role_permissions.length
 			@role.permissions = [@full_access, @partial_access]
 			@role.save
@@ -27,15 +27,15 @@ describe SpudRole, :type => :model do
 		end
 	end
 
-	describe "permission_tags" do
-		it "should return an array of Strings" do
+	describe 'permission_tags' do
+		it 'should return an array of Strings' do
 			expect(@role.permission_tags).to be_an_instance_of(Array)
 			expect(@role.permission_tags.first).to be_an_instance_of(String)
 		end
 	end
 
-	describe "permission_tags=" do
-		it "should update the SpudRolePermissions on the role" do
+	describe 'permission_tags=' do
+		it 'should update the SpudRolePermissions on the role' do
 			original_count = @role.spud_role_permissions.length
 			@role.permission_tags = ['admin.test.full_access', 'admin.test.partial_access']
 			@role.save

data/spec/models/spud_user_spec.rb

@@ -1,60 +1,47 @@
 require 'rails_helper'
 
-describe SpudUser, :type => :model do
+describe SpudUser, type: :model do
 
-  describe ".full_name" do
-    it "should return the full name if the first and last name are not blank" do
+  describe '.full_name' do
+    it 'should return the full name if the first and last name are not blank' do
       u = FactoryGirl.build(:spud_user)
       expect(u.full_name).to  eq("#{u.first_name} #{u.last_name}")
     end
-  
-    it "should return only the last name if the first name is blank" do
-      u = FactoryGirl.build(:spud_user, :first_name => nil)
+
+    it 'should return only the last name if the first name is blank' do
+      u = FactoryGirl.build(:spud_user, first_name: nil)
       expect(u.full_name).to  eq(u.last_name)
     end
-  
-    it "should return only the first name if the last name is blank" do
-      u = FactoryGirl.build(:spud_user, :last_name => nil)
+
+    it 'should return only the first name if the last name is blank' do
+      u = FactoryGirl.build(:spud_user, last_name: nil)
       expect(u.full_name).to  eq(u.first_name)
     end
-  
-    it "should return the login if the first and last name are blank" do
-      u = FactoryGirl.build(:spud_user, :first_name => nil, :last_name => nil)
-      expect(u.full_name).to  eq(u.login)
-    end
-  end
 
-  describe '#email_formatted' do
-    it 'should return an email formtted for sending' do
-      user = FactoryGirl.create(:spud_user)
-      expect(user.email_formatted).to eq("#{user.full_name} <#{user.email}>")
+    it 'should return the login if the first and last name are blank' do
+      u = FactoryGirl.build(:spud_user, first_name: nil, last_name: nil)
+      expect(u.full_name).to  eq(u.login)
     end
   end
 
-  it { should_not allow_value('').for(:login) }
-  it { should validate_length_of(:login).is_at_least(3) }
-  it { should validate_length_of(:password).is_at_least(4) }
-  it { should_not allow_value('@mail.com').for(:email) }
-  it { should_not allow_value('mail.com').for(:email) }
-  it { should allow_value('test@mail.com').for(:email) }
-
-  it "must match password confirmation before saving a new user" do
-    u = FactoryGirl.build(:spud_user, :password_confirmation => '')
+  it 'must match password confirmation before saving a new user' do
+    u = FactoryGirl.build(:spud_user, password_confirmation: '')
     expect(u.save).to eq(false)
   end
 
   describe '#unset_requires_password_change' do
     it 'should not unset the requires_password_change flag' do
-      u = FactoryGirl.create(:spud_user, :requires_password_change => true)
+      u = FactoryGirl.create(:spud_user, requires_password_change: true)
       expect{
-        u.update_attributes(:first_name => 'updated')
+        u.update_attributes(first_name: 'updated')
       }.to_not change(u, :requires_password_change)
     end
 
     it 'should unset the requires_password_change flag' do
-      u = FactoryGirl.create(:spud_user, :requires_password_change => true)
+      u = FactoryGirl.create(:spud_user, requires_password_change: true)
       expect{
-        u.update_attributes(:password => 'updated', :password_confirmation => 'updated')
+        u.update_attributes(password: 'new password', password_confirmation: 'new password')
+        u.reload
       }.to change(u, :requires_password_change).from(true).to(false)
     end
   end

data/spec/rails_helper.rb

@@ -1,15 +1,15 @@
 # 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 'session_helper'
 require 'tb_core/test_helper'
+require 'rails-controller-testing'
 require 'rspec/rails'
 require 'database_cleaner'
 require 'simplecov'
 require 'factory_girl_rails'
-require 'shoulda'
 
 SimpleCov.start 'rails'
 
@@ -37,11 +37,10 @@ SimpleCov.start 'rails'
 RSpec.configure do |config|
   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.
-  config.use_transactional_fixtures = true
 
   # RSpec Rails can automatically mix in different behaviours to your tests
   # based on their file location, for example enabling you to call `get` and
@@ -69,5 +68,5 @@ RSpec.configure do |config|
       example.run
     end
   end
-  
+
 end