tb_core 1.3.10 → 1.4.beta1

data/spec/controllers/admin/password_reset_controller_spec.rb

@@ -1,30 +1,30 @@
 require 'rails_helper'
 
-describe Admin::PasswordResetsController, :type => :controller do
+describe Admin::PasswordResetsController, type: :controller do
 
-  let(:user) { FactoryGirl.build(:spud_user, :id => 1, :perishable_token => "jfdlsafhbkvabuadfbds") }
+  let(:user) { FactoryGirl.build(:spud_user, id: 1, perishable_token: 'jfdlsafhbkvabuadfbds') }
 
   context 'get' do
     describe 'index' do
-      it "should return success" do
+      it 'should return success' do
         get :index
         expect(response).to be_success
       end
     end
 
     describe 'show' do
-      context "with a valid id" do
-        it "should render the edit form" do
+      context 'with a valid id' do
+        it 'should render the edit form' do
           allow(SpudUser).to receive(:find_using_perishable_token).and_return(user)
-          get :show, :id => 1
+          get :show, params: { id: 1 }
           expect(response).to be_success
         end
       end
 
-      context "with an invalid id" do
-        it "should redirect to the login form" do
+      context 'with an invalid id' do
+        it 'should redirect to the login form' do
           allow(SpudUser).to receive(:find_using_perishable_token).and_return(nil)
-          get :show, :id => user.id
+          get :show, params: { id: user.id }
           expect(response).to redirect_to(admin_login_path)
         end
       end
@@ -34,53 +34,52 @@ describe Admin::PasswordResetsController, :type => :controller do
   context 'post' do
 
     describe 'create' do
-      context "with a valid user email address submitted" do
-        it "should trigger the password notificiation" do
+      context 'with a valid user email address submitted' do
+        it 'should trigger the password notificiation' do
           allow(SpudUser).to receive(:find_by_email).and_return(user)
-
-          expect{ post :create, :email => user.email}.to change{
-            ActionMailer::Base.deliveries.count
-          }.by(1)
+          expect do
+            post :create, params: { email: user.email }
+          end.to have_enqueued_job.on_queue('mailers')
         end
 
-        it "should redirect to the login form" do
+        it 'should redirect to the login form' do
           allow(SpudUser).to receive(:find_by_email).and_return(user)
 
-          post :create, :email => user.email
+          post :create, params: { email: user.email }
           expect(response).to redirect_to(admin_login_path)
         end
       end
 
-      context "with an invalid user email address submitted" do
+      context 'with an invalid user email address submitted' do
         before(:each) do
           allow(SpudUser).to receive(:find_by_email).and_return(nil)
         end
-        it "should re-render the password reset form" do
-          post :create, :email => "invalid@email.com"
-          expect(response).to render_template("index")
+        it 'should re-render the password reset form' do
+          post :create, params: { email: 'invalid@email.com' }
+          expect(response).to render_template('index')
         end
       end
     end
 
     describe 'update' do
-      let(:valid_data) { {:id => user.id, :spud_user => {:password => "password", :password_confirmation => "password"}}}
-      let(:invalid_data) { {:id => user.id, :spud_user => {:password => "password", :password_confirmation => "drowssap"}}}
+      let(:valid_data) { {id: user.id, spud_user: {password: 'password', password_confirmation: 'password'}}}
+      let(:invalid_data) { {id: user.id, spud_user: {password: 'password', password_confirmation: 'drowssap'}}}
 
       before(:each) do
         allow(SpudUser).to receive(:find_using_perishable_token).and_return(user)
       end
 
-      context "with valid password entry" do
-        it "should save and redirect to the login form" do
-          post :update, valid_data
+      context 'with valid password entry' do
+        it 'should save and redirect to the login form' do
+          post :update, params: valid_data
           expect(response).to redirect_to(admin_login_path)
         end
       end
 
-      context "with an invalid password entry" do
-        it "should re-render the password form" do
-          post :update, invalid_data
-          expect(response).to render_template("show")
+      context 'with an invalid password entry' do
+        it 'should re-render the password form' do
+          post :update, params: invalid_data
+          expect(response).to render_template('show')
         end
       end
     end

data/spec/controllers/admin/settings_controller_spec.rb

@@ -1,32 +1,32 @@
 require 'rails_helper'
 
-describe Admin::SettingsController, :type => :controller do
+describe Admin::SettingsController, type: :controller do
   before(:each) do
     activate_session(admin: true)
   end
-  
+
   describe 'edit' do
-    it "should respond with success" do
+    it 'should respond with success' do
       get :edit
       expect(response).to be_success
     end
   end
-  
+
   describe 'update' do
-    it "should give an error if password change does not include a valid current password" do
+    it 'should give an error if password change does not include a valid current password' do
       u = FactoryGirl.build(:spud_user)
-      u.password = "test"
-      put :update, :spud_user => {:first_name => "Mike", :password => "Imapassword", :current_password => "ImaTest"}
-      is_expected.to respond_with 401
+      u.password = 'test'
+      put :update, params: { spud_user: {first_name: 'Mike', password: 'Imapassword', current_password: 'ImaTest'} }
+      expect(response).to have_http_status(401)
     end
 
-    it "should redirect to the settings page with a successful update" do
-      put :update, :spud_user => {:first_name => "Mike"}
+    it 'should redirect to the settings page with a successful update' do
+      put :update, params: { spud_user: {first_name: 'Mike'} }
       expect(response).to redirect_to(admin_settings_path)
     end
-    
-    it "should put a message in the flash notice" do
-      put :update, :spud_user => {:first_name => "Mike"}
+
+    it 'should put a message in the flash notice' do
+      put :update, params: { spud_user: {first_name: 'Mike'} }
       expect(flash[:notice]).to_not be_blank
     end
   end

data/spec/controllers/admin/setup_controller_spec.rb

@@ -1,31 +1,31 @@
 require 'rails_helper'
 
-describe Admin::SetupController, :type => :controller do
-  
+describe Admin::SetupController, type: :controller do
+
   describe 'new' do
-    it "should be successful" do
+    it 'should be successful' do
       get :new
-      
+
       expect(response).to be_success
     end
-    
-    it "should redirect to the admin login form when there is already a user" do
+
+    it 'should redirect to the admin login form when there is already a user' do
       allow(SpudUser).to receive(:count).and_return(1)
       get :new
-      
+
       expect(response).to redirect_to(admin_login_path)
     end
   end
 
   describe 'create' do
-    it "should create a new user" do
+    it 'should create a new user' do
       expect{
-        post :create, :spud_user => FactoryGirl.attributes_for(:spud_user)
+        post :create, params: { spud_user: FactoryGirl.attributes_for(:spud_user) }
       }.to change(SpudUser, :count).by(1)
     end
-    
-    it "should redirect to the admin dashboard when first admin user has been created" do
-      post :create, :spud_user => FactoryGirl.attributes_for(:spud_user)
+
+    it 'should redirect to the admin dashboard when first admin user has been created' do
+      post :create, params: { spud_user: FactoryGirl.attributes_for(:spud_user) }
       expect(response).to redirect_to(admin_root_path)
     end
   end

data/spec/controllers/admin/user_sessions_controller_spec.rb

@@ -1,18 +1,18 @@
 require 'rails_helper'
 
-describe Admin::UserSessionsController, :type => :controller do
+describe Admin::UserSessionsController, type: :controller do
   before(:each) do
     # activate_authlogic
     # SpudUserSession.create(FactoryGirl.build(:spud_user))
   end
 
   describe 'new' do
-    it "should redirect to setup url if no users exist" do
+    it 'should redirect to setup url if no users exist' do
       get :new
       expect(response).to redirect_to(admin_setup_path)
     end
 
-    it "should render login form if users do exist" do
+    it 'should render login form if users do exist' do
       u = FactoryGirl.create(:spud_user)
       u.save
       get :new

data/spec/controllers/admin/users_controller_spec.rb

@@ -1,154 +1,157 @@
 require 'rails_helper'
 
-describe Admin::UsersController, :type => :controller do
+describe Admin::UsersController, type: :controller do
 
   before(:each) do
     activate_session(admin: true)
     @role = FactoryGirl.create(:spud_role)
-    Spud::Core.admin_applications += [{:name => 'Test', :key => :test}]
+    Spud::Core.admin_applications += [{name: 'Test', key: :test}]
     Spud::Core.permissions.push(SpudPermission.new('admin.test.full_access', 'Test', [:test]))
   end
-  
+
   describe 'index' do
-    it "should return an array of users" do
+    it 'should return an array of users' do
       2.times {|x| FactoryGirl.create(:spud_user) }
       get :index
-      
+
       expect(assigns(:spud_users).count).to be > 1
     end
-    
-    it "should not return any users if there are no users" do
+
+    it 'should not return any users if there are no users' do
       get :index
-      
+
       expect(assigns(:spud_users).count).to eq(1) # the currently logged in user is the only user
     end
-    
-    it "should not allow access to users with NO permissions" do
-      SpudUserSession.create(FactoryGirl.build(:spud_user, :super_admin => false))
+
+    it 'should not allow access to users with NO permissions' do
+      SpudUserSession.create(FactoryGirl.build(:spud_user, super_admin: false))
       get :index
-      
-      expect(response.code).to eq("403")
+
+      expect(response.code).to eq('403')
       expect(response).to render_template('layouts/admin/error_page')
     end
-    
-    it "should allow access to users with the correct permissions" do
-      u = FactoryGirl.create(:spud_user, :super_admin => false)
+
+    it 'should allow access to users with the correct permissions' do
+      u = FactoryGirl.create(:spud_user, super_admin: false)
       @role.permission_tags = ['admin.users.full_access']
       @role.save()
       u.role = @role
       SpudUserSession.create(u)
       get :index
-      
+
       expect(response).to be_success
     end
 
-    it "should not allow access to users without a role, and redirect to render error page if the user has no permissions" do
-      u = FactoryGirl.create(:spud_user, :super_admin => false)
+    it 'should not allow access to users without a role,
+      and redirect to render error page if the user has no permissions' do
+      u = FactoryGirl.create(:spud_user, super_admin: false)
       u.role = nil
       SpudUserSession.create(u)
       get :index
-      
-      expect(response.code).to eq("403")
+
+      expect(response.code).to eq('403')
       expect(response).to render_template('layouts/admin/error_page')
     end
 
-    it "should not allow access to users with a role that contains no permissions, and render error page if the users has no other admin modules" do
-      u = FactoryGirl.create(:spud_user, :super_admin => false)
+    it 'should not allow access to users with a role that contains no permissions,
+      and render error page if the users has no other admin modules' do
+      u = FactoryGirl.create(:spud_user, super_admin: false)
       u.role = @role
       @role.spud_role_permissions = []
       SpudUserSession.create(u)
       get :index
-      
-      expect(response.code).to eq("403")
+
+      expect(response.code).to eq('403')
       expect(response).to render_template('layouts/admin/error_page')
     end
-    
-    it "should not allow access to users without permission and render error page if the users has other admin modules" do
-      u = FactoryGirl.create(:spud_user, :super_admin => false)
+
+    it 'should not allow access to users without permission
+      and render error page if the users has other admin modules' do
+      u = FactoryGirl.create(:spud_user, super_admin: false)
       @role.permission_tags = ['admin.test.full_access']
       u.role = @role
       SpudUserSession.create(u)
       get :index
-      
-      expect(response.code).to eq("403")
+
+      expect(response.code).to eq('403')
       expect(response).to render_template('layouts/admin/error_page')
     end
   end
-  
+
   describe 'show' do
-    it "should respond successfully" do
+    it 'should respond successfully' do
       user = FactoryGirl.create(:spud_user)
-      get :show, :id => user.id
+      get :show, params: { id: user.id }
       expect(response).to be_success
     end
   end
-  
+
   describe 'new' do
-    it "should render the form" do
-      get :new, :format => :html
+    it 'should render the form' do
+      get :new, format: :html
       expect(response).to be_success
     end
   end
-  
+
   describe 'create' do
-    context "HTML format" do
-      it "should create a new user with a valid form submission" do
+    context 'HTML format' do
+      it 'should create a new user with a valid form submission' do
         expect {
-          post :create, :spud_user => FactoryGirl.attributes_for(:spud_user)
+          post :create, params: { spud_user: FactoryGirl.attributes_for(:spud_user) }
         }.to change(SpudUser, :count).by(1)
       end
-    
-      it "should not create a user with an invalid form entry" do
+
+      it 'should not create a user with an invalid form entry' do
         expect {
-          post :create, :spud_user => FactoryGirl.attributes_for(:spud_user, :email => nil)
+          post :create, params: { spud_user: FactoryGirl.attributes_for(:spud_user, email: nil) }
         }.to_not change(SpudUser, :count)
       end
-    end    
+    end
   end
-  
+
   describe 'edit' do
-    context "HTML format" do
-      it "should load the correct user for the edit form" do
+    context 'HTML format' do
+      it 'should load the correct user for the edit form' do
         user = FactoryGirl.create(:spud_user)
-        get :edit, :id => user.id
-      
+        get :edit, params: { id: user.id }
+
         expect(assigns(:user).id).to eq(user.id)
       end
     end
   end
-  
+
   describe 'update' do
-    it "should update the email when the first name attribute is changed" do
+    it 'should update the email when the first name attribute is changed' do
       user = FactoryGirl.create(:spud_user)
-      new_name = "Adam"
+      new_name = 'Adam'
       expect {
-        put :update, :id => user.id, :spud_user => user.attributes.merge!(:first_name => new_name)
+        put :update, params: { id: user.id, spud_user: { first_name: new_name } }
         user.reload
       }.to change(user, :first_name).to(new_name)
     end
-    
-    it "should redirect to the admin users show view after a successful update" do
+
+    it 'should redirect to the admin users show view after a successful update' do
       user = FactoryGirl.create(:spud_user)
-      put :update, :id => user.id, :spud_user => user.attributes.merge!(:first_name => "Adam")
-      
+      put :update, params: { id: user.id, spud_user: user.attributes.merge!(first_name: 'Adam') }
+
       expect(response).to redirect_to(admin_user_path(user))
     end
   end
-  
+
   describe 'destroy' do
-    it "should destroy the user" do
+    it 'should destroy the user' do
       user = FactoryGirl.create(:spud_user)
       expect {
-        delete :destroy, :id => user.id
+        delete :destroy, params: { id: user.id }
       }.to change(SpudUser, :count).by(-1)
       expect(response).to be_redirect
     end
-    
-    it "should destroy the user with the wrong id" do
-      user = FactoryGirl.create(:spud_user)
+
+    it 'should destroy the user with the wrong id' do
+      FactoryGirl.create(:spud_user)
       expect {
-        delete :destroy, :id => "23532"
+        delete :destroy, params: { id: '23532' }
       }.to_not change(SpudUser, :count)
     end
   end
-end
+end

data/spec/controllers/spud/application_controller_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 require 'rspec/mocks'
 require 'rspec/mocks/standalone'
 
-describe Spud::ApplicationController, :type => :controller do
+describe Spud::ApplicationController, type: :controller do
 
   describe 'not_found' do
     it 'throws a 404 error' do

data/spec/dummy/config/application.rb

@@ -3,13 +3,13 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
 Bundler.require
-require "tb_core"
+require 'tb_core'
 
 module Dummy
   class Application < Rails::Application
     Spud::Core.configure do |config|
-      config.site_name = "Dummy"
-      config.from_address = "no-reply@dummy.com"
+      config.site_name = 'Dummy'
+      config.from_address = 'no-reply@dummy.com'
     end
 
     # Settings in config/environments/* take precedence over those specified here.
@@ -36,7 +36,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]
@@ -53,11 +53,10 @@ module Dummy
     # config.active_record.whitelist_attributes = true
 
     # Enable the asset pipeline
-    config.assets.enabled = true
+    # config.assets.enabled = true
 
     # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
+    # config.assets.version = '1.0'
 
   end
 end
-

data/spec/dummy/config/database.yml

@@ -1,18 +1,9 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
-development:
-  adapter: mysql2
-  database: tb_core_development
-  encoding: utf8mb4
-  collation: utf8mb4_bin
-  username: root
+default: &default
+  adapter: postgresql
+  encoding: unicode
+  pool: 5
 
 test:
-  adapter: mysql2
-  database: tb_core_test
-  encoding: utf8mb4
-  collation: utf8mb4_bin
-  username: root
+  <<: *default
+  database: <%= ENV['DATABASE_NAME_TEST'] || 'tb_core_test' %>
+  password: <%= ENV['DATABASE_PASSWORD'] %>

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
@@ -35,6 +35,9 @@ Dummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
+  # Use test jobs adapter
+  config.active_job.queue_adapter = :test
+
   # Deprecated
   # Raise exception on mass assignment protection for Active Record models
   # config.active_record.mass_assignment_sanitizer = :strict

data/spec/dummy/config/routes.rb

@@ -1,5 +1,5 @@
 Rails.application.routes.draw do
 
   # mount SpudCore::Engine => "/spud_core"
-    root :to => "pages#show", :id => "home"
+    root to: 'pages#show', id: 'home'
 end