g5_authenticatable 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae757957f1f5fa394c3e50c00878dbef38ead011
-  data.tar.gz: db45e799105de584c46598aa6b3697e1ef0832d5
+  metadata.gz: fafd0add7d0b2d50524234cedb46b4db03da7526
+  data.tar.gz: 501fce66ab149473948e5a87a1c29a013880299e
 SHA512:
-  metadata.gz: 48302016e4b40177451d5180d538e945fbe74f019dcf8806bf1fe5235228ab7d5a4ee258c775ef56453a487d66da6ae3f7d109dffdebca0254f4903b70229dbb
-  data.tar.gz: a512cd732bbb37844436529b752c2bcc43cb8c6c18f9ba16129a9a107ebdbf3e41901e9e9d0e36a7768ed2eb3a98356302a3439868cb85a0ee8696c463915e85
+  metadata.gz: 9fd11e97ca4e4551abc0036e994b76e43c533fa65564277e5977f37bbc078aa7a132e23e5f580ae0a73456f827202401761dfdba80371a218d9cb497aafe94b8
+  data.tar.gz: 7e42afc27a541a8bf1ad88154fa3bf84b1a14caee4c1e1512f688eedf6db868428daa88b71e6f605782ca9f7a8550aca67d614d366cca713f872eeeaf9d2bc57

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v1.1.0 (2017-12-08)
+
+* Added support for [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails)
+  while deprecating support for factory_girl_rails. Existing projects that use
+  FactoryGirl will continue to work with the auth test helpers, but we recommend
+  [upgrading to factory_bot](https://github.com/thoughtbot/factory_bot/blob/4-9-0-stable/UPGRADE_FROM_FACTORY_GIRL.md)
+  at your earliest convenience.
+
 ## v1.0.0 (2017-10-19)
 
 * **Backwards incompatible changes**

data/README.md

@@ -18,7 +18,7 @@ library in isolation.
 
 ## Current Version
 
-1.0.0
+1.1.0
 
 ## Requirements
 
@@ -465,7 +465,7 @@ Because the test helpers are optional, bundler will not automatically install
 these dependencies. You will have to add the following gems to your own Gemfile:
 
 * [rspec-rails](https://github.com/rspec/rspec-rails)
-* [factory_girl_rails](https://github.com/thoughtbot/factory_girl_rails)
+* [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails)
 * [webmock](https://github.com/bblimke/webmock)
 
 #### Incompatibilities ####
@@ -654,7 +654,7 @@ method like so:
 
 ```ruby
 describe 'my page' do
-  let(:user) { FactoryGirl.create(:g5_authenticatable_user) }
+  let(:user) { FactoryBot.create(:g5_authenticatable_user) }
 
   before do
     stub_g5_omniauth(user)
@@ -670,7 +670,7 @@ token using the `stub_invalid_access_token` helper:
 
 ```ruby
 describe 'my API call' do
-  let(:user) { FactoryGirl.create(:g5_authenticatable_user) }
+  let(:user) { FactoryBot.create(:g5_authenticatable_user) }
 
   before { login_user }
 

data/g5_authenticatable.gemspec

@@ -28,6 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'pundit', '~> 1.0'
   spec.add_dependency 'g5_updatable', '> 0.6.0'
 
-  spec.add_development_dependency 'factory_girl_rails', '~> 4.8'
+  spec.add_development_dependency 'factory_bot_rails', '~> 4.8'
   spec.add_development_dependency 'webmock'
 end

data/lib/g5_authenticatable/engine.rb

@@ -11,7 +11,6 @@ module G5Authenticatable
     config.generators do |g|
       g.orm :active_record
       g.test_framework :rspec
-      g.fixture_replacement :factory_girl, dir: 'spec/factories'
     end
 
     initializer 'g5_authenticatable.filter_access_token' do |app|

data/lib/g5_authenticatable/test/controller_helpers.rb

@@ -17,13 +17,13 @@ module G5Authenticatable
 end
 
 RSpec.shared_context 'auth controller' do
-  let(:user) { FactoryGirl.create(:g5_authenticatable_user) }
+  let(:user) { FactoryBot.create(:g5_authenticatable_user) }
   include_context 'authorization controller'
 end
 
 RSpec.shared_context 'super admin auth controller' do
   let(:user) do
-    user = FactoryGirl.create(:g5_authenticatable_user)
+    user = FactoryBot.create(:g5_authenticatable_user)
     user.add_role(:super_admin)
     user
   end
@@ -32,7 +32,7 @@ end
 
 RSpec.shared_context 'admin auth controller' do
   let(:user) do
-    user = FactoryGirl.create(:g5_authenticatable_user)
+    user = FactoryBot.create(:g5_authenticatable_user)
     user.add_role(:admin)
     user
   end

data/lib/g5_authenticatable/test/factories/client_users.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :g5_authenticatable_client_user, parent: :g5_authenticatable_user do
     transient do
       clients nil

data/lib/g5_authenticatable/test/factories/global_users.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :g5_authenticatable_user, class: 'G5Authenticatable::User' do
     sequence(:email) { |n| "test.user#{n}@test.host" }
     provider 'g5'
@@ -16,28 +16,28 @@ FactoryGirl.define do
   factory :g5_authenticatable_super_admin, parent: :g5_authenticatable_user do
     after(:build) do |user|
       user.roles.clear
-      user.roles << FactoryGirl.build(:g5_authenticatable_super_admin_role)
+      user.roles << FactoryBot.build(:g5_authenticatable_super_admin_role)
     end
   end
 
   factory :g5_authenticatable_admin, parent: :g5_authenticatable_user do
     after(:build) do |user|
       user.roles.clear
-      user.roles << FactoryGirl.build(:g5_authenticatable_admin_role)
+      user.roles << FactoryBot.build(:g5_authenticatable_admin_role)
     end
   end
 
   factory :g5_authenticatable_editor, parent: :g5_authenticatable_user do
     after(:build) do |user|
       user.roles.clear
-      user.roles << FactoryGirl.build(:g5_authenticatable_editor_role)
+      user.roles << FactoryBot.build(:g5_authenticatable_editor_role)
     end
   end
 
   factory :g5_authenticatable_viewer, parent: :g5_authenticatable_user do
     after(:build) do |user|
       user.roles.clear
-      user.roles << FactoryGirl.build(:g5_authenticatable_viewer_role)
+      user.roles << FactoryBot.build(:g5_authenticatable_viewer_role)
     end
   end
 end

data/lib/g5_authenticatable/test/factories/location_users.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :g5_authenticatable_location_user, parent: :g5_authenticatable_user do
     transient do
       locations nil

data/lib/g5_authenticatable/test/factories/roles.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :g5_authenticatable_role, class: 'G5Authenticatable::Role' do
     sequence(:name) { |n| "role_#{n}" }
   end

data/lib/g5_authenticatable/test/factory.rb

@@ -1,6 +1,19 @@
 # frozen_string_literal: true
 
-require 'factory_girl_rails'
+# TODO: drop factory_girl support and force people to upgrade
+# once g5_updatable factories are using the FactoryBot constant
+begin
+  # We need to define the aliased constant before the *_rails gem
+  # tries to load any factory definitions
+  require 'factory_bot'
+  FactoryGirl = FactoryBot
+  require 'factory_bot_rails'
+rescue LoadError
+  require 'factory_girl'
+  FactoryBot = FactoryGirl
+  require 'factory_girl_rails'
+end
+
 require 'g5_authenticatable/test/factories/roles'
 require 'g5_authenticatable/test/factories/global_users'
 require 'g5_authenticatable/test/factories/client_users'

data/lib/g5_authenticatable/test/feature_helpers.rb

@@ -52,7 +52,7 @@ end
 RSpec.shared_context 'auth' do
   include G5Authenticatable::Test::FeatureHelpers
 
-  let(:user) { FactoryGirl.create(:g5_authenticatable_user) }
+  let(:user) { FactoryBot.create(:g5_authenticatable_user) }
 
   before do
     stub_g5_omniauth(user)

data/lib/g5_authenticatable/test/request_helpers.rb

@@ -20,7 +20,7 @@ end
 RSpec.shared_context 'auth request' do
   include G5Authenticatable::Test::RequestHelpers
 
-  let(:user) { FactoryGirl.create(:g5_authenticatable_user) }
+  let(:user) { FactoryBot.create(:g5_authenticatable_user) }
 
   before do
     login_user(user)

data/lib/g5_authenticatable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module G5Authenticatable
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/factories/post.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :post do
     sequence(:content) { |n| "This is my post #{n}" }
     association :author, factory: :g5_authenticatable_user

data/spec/features/default_role_authorization_spec.rb

@@ -6,13 +6,13 @@ RSpec.describe 'Default role-based authorization UI' do
   describe 'Posts index' do
     let(:visit_posts_index) { visit_path_and_login_with(posts_path, user) }
 
-    let!(:post) { FactoryGirl.create(:post, author: user) }
-    let!(:other_post) { FactoryGirl.create(:post) }
+    let!(:post) { FactoryBot.create(:post, author: user) }
+    let!(:other_post) { FactoryBot.create(:post) }
 
     before { visit_posts_index }
 
     context 'when authenticated user is a super admin' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_super_admin) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_super_admin) }
 
       it 'renders the posts index page' do
         expect(current_path).to eq(posts_path)
@@ -28,7 +28,7 @@ RSpec.describe 'Default role-based authorization UI' do
     end
 
     context 'when authenticated user is not a super admin' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_user) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_user) }
 
       it 'displays an error message' do
         expect(page).to have_content(/forbidden/i)
@@ -47,12 +47,12 @@ RSpec.describe 'Default role-based authorization UI' do
   describe 'Show post' do
     let(:show_post) { visit_path_and_login_with(post_path(post.id), user) }
 
-    let!(:post) { FactoryGirl.create(:post, author: user) }
+    let!(:post) { FactoryBot.create(:post, author: user) }
 
     before { show_post }
 
     context 'when authenticated user is a super_admin' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_super_admin) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_super_admin) }
 
       it 'renders the show post page' do
         expect(current_path).to eq(post_path(post.id))
@@ -64,7 +64,7 @@ RSpec.describe 'Default role-based authorization UI' do
     end
 
     context 'when authenticated user is not a super_admin' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_user) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_user) }
 
       it 'displays an error message' do
         expect(page).to have_content(/forbidden/i)
@@ -82,7 +82,7 @@ RSpec.describe 'Default role-based authorization UI' do
     before { visit_new_post }
 
     context 'when authenticated user is a super admin' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_super_admin) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_super_admin) }
 
       it 'renders the new post page' do
         expect(current_path).to eq(new_post_path)
@@ -94,7 +94,7 @@ RSpec.describe 'Default role-based authorization UI' do
     end
 
     context 'when authenticated user is not a super admin' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_user) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_user) }
 
       it 'displays an error message' do
         expect(page).to have_content(/forbidden/i)
@@ -114,8 +114,8 @@ RSpec.describe 'Default role-based authorization UI' do
       fill_in 'Content', with: post.content
     end
 
-    let(:post) { FactoryGirl.build(:post, author: user) }
-    let(:user) { FactoryGirl.create(:g5_authenticatable_super_admin) }
+    let(:post) { FactoryBot.build(:post, author: user) }
+    let(:user) { FactoryBot.create(:g5_authenticatable_super_admin) }
 
     context 'when authenticated user is a super admin' do
       it 'renders the flash message' do
@@ -155,10 +155,10 @@ RSpec.describe 'Default role-based authorization UI' do
     end
     before { edit_post }
 
-    let(:post) { FactoryGirl.create(:post, author: user) }
+    let(:post) { FactoryBot.create(:post, author: user) }
 
     context 'when authenticated user is a super admin' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_super_admin) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_super_admin) }
 
       it 'renders the edit post page' do
         expect(current_path).to eq(edit_post_path(post.id))
@@ -170,7 +170,7 @@ RSpec.describe 'Default role-based authorization UI' do
     end
 
     context 'when authenticated user is not a super admin' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_user) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_user) }
 
       it 'displays an error message' do
         expect(page).to have_content(/forbidden/i)
@@ -190,8 +190,8 @@ RSpec.describe 'Default role-based authorization UI' do
       fill_in 'Content', with: new_content
     end
 
-    let(:post) { FactoryGirl.create(:post, author: user) }
-    let(:user) { FactoryGirl.create(:g5_authenticatable_super_admin) }
+    let(:post) { FactoryBot.create(:post, author: user) }
+    let(:user) { FactoryBot.create(:g5_authenticatable_super_admin) }
     let(:new_content) { 'My updated post content' }
 
     context 'when authenticated user is a super admin' do
@@ -226,8 +226,8 @@ RSpec.describe 'Default role-based authorization UI' do
   describe 'Delete post' do
     subject(:delete_post) { click_link 'Destroy' }
 
-    let!(:post) { FactoryGirl.create(:post, author: user) }
-    let(:user) { FactoryGirl.create(:g5_authenticatable_super_admin) }
+    let!(:post) { FactoryBot.create(:post, author: user) }
+    let(:user) { FactoryBot.create(:g5_authenticatable_super_admin) }
 
     before { visit_path_and_login_with(posts_path, user) }
 

data/spec/features/sign_in_spec.rb

@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe 'Signing in' do
-  let(:user) { FactoryGirl.create(:g5_authenticatable_viewer) }
+  let(:user) { FactoryBot.create(:g5_authenticatable_viewer) }
 
   context 'from a login link' do
     subject(:login) { click_link 'Login' }
@@ -43,7 +43,7 @@ RSpec.describe 'Signing in' do
       let(:updated_organization_name) { "Updated #{user.organization_name}" }
       let(:updated_access_token) { "updated-#{user.g5_access_token}-123" }
       let(:updated_role) do
-        FactoryGirl.create(:g5_authenticatable_super_admin_role)
+        FactoryBot.create(:g5_authenticatable_super_admin_role)
       end
 
       it 'should sign in the user successfully' do
@@ -136,10 +136,10 @@ RSpec.describe 'Signing in' do
       end
 
       let(:user_attributes) do
-        FactoryGirl.attributes_for(:g5_authenticatable_user)
+        FactoryBot.attributes_for(:g5_authenticatable_user)
       end
       let(:role_attributes) do
-        FactoryGirl.attributes_for(:g5_authenticatable_editor_role)
+        FactoryBot.attributes_for(:g5_authenticatable_editor_role)
       end
 
       it 'should sign in the user successfully' do

data/spec/features/token_validation_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe 'UI Token validation' do
     before { G5Authenticatable.strict_token_validation = true }
 
     context 'when user has a valid g5 access token' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_user) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_user) }
 
       before do
         stub_g5_omniauth(user)
@@ -27,7 +27,7 @@ RSpec.describe 'UI Token validation' do
     end
 
     context 'when user access token becomes invalid' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_user) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_user) }
 
       before do
         # User access token is valid at sign in
@@ -67,7 +67,7 @@ RSpec.describe 'UI Token validation' do
     end
 
     context 'when user access token has become invalid' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_user) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_user) }
 
       before do
         stub_g5_omniauth(user)

data/spec/models/g5_authenticatable/role_spec.rb

@@ -5,7 +5,7 @@ require 'rails_helper'
 RSpec.describe G5Authenticatable::Role do
   subject { role }
   let(:role) { G5Authenticatable::Role.new(role_attributes) }
-  let(:role_attributes) { FactoryGirl.attributes_for(:g5_authenticatable_role) }
+  let(:role_attributes) { FactoryBot.attributes_for(:g5_authenticatable_role) }
 
   it { is_expected.to have_and_belong_to_many(:users) }
   it { is_expected.to belong_to(:resource) }
@@ -17,10 +17,10 @@ RSpec.describe G5Authenticatable::Role do
   describe '.global' do
     subject(:global) { G5Authenticatable::Role.global }
     let!(:global_role) { user.roles.first }
-    let(:user) { FactoryGirl.create(:g5_authenticatable_viewer) }
+    let(:user) { FactoryBot.create(:g5_authenticatable_viewer) }
 
     let!(:scoped_role) do
-      FactoryGirl.create(:g5_authenticatable_role,
+      FactoryBot.create(:g5_authenticatable_role,
                          resource: user)
     end
 
@@ -37,15 +37,15 @@ RSpec.describe G5Authenticatable::Role do
     subject(:class_scoped) do
       G5Authenticatable::Role.class_scoped(G5Authenticatable::User)
     end
-    let!(:global_role) { FactoryGirl.create(:g5_authenticatable_role) }
+    let!(:global_role) { FactoryBot.create(:g5_authenticatable_role) }
     let!(:class_scoped_role) do
-      FactoryGirl.create(:g5_authenticatable_role,
+      FactoryBot.create(:g5_authenticatable_role,
                          resource_type: 'G5Authenticatable::User')
     end
     let!(:instance_scoped_role) do
-      FactoryGirl.create(:g5_authenticatable_role, resource: user)
+      FactoryBot.create(:g5_authenticatable_role, resource: user)
     end
-    let(:user) { FactoryGirl.create(:g5_authenticatable_user) }
+    let(:user) { FactoryBot.create(:g5_authenticatable_user) }
 
     it 'should match one role' do
       expect(class_scoped.count).to eq(1)
@@ -58,21 +58,21 @@ RSpec.describe G5Authenticatable::Role do
 
   describe '.instance_scoped' do
     subject(:instance_scoped) { G5Authenticatable::Role.instance_scoped(user) }
-    let!(:global_role) { FactoryGirl.create(:g5_authenticatable_role) }
+    let!(:global_role) { FactoryBot.create(:g5_authenticatable_role) }
     let!(:class_scoped_role) do
-      FactoryGirl.create(:g5_authenticatable_role,
+      FactoryBot.create(:g5_authenticatable_role,
                          resource_type: 'G5Authenticatable::User')
     end
 
     let!(:user_scoped_role) do
-      FactoryGirl.create(:g5_authenticatable_role, resource: user)
+      FactoryBot.create(:g5_authenticatable_role, resource: user)
     end
-    let(:user) { FactoryGirl.create(:g5_authenticatable_user) }
+    let(:user) { FactoryBot.create(:g5_authenticatable_user) }
 
     let!(:other_user_scoped_role) do
-      FactoryGirl.create(:g5_authenticatable_role, resource: other_user)
+      FactoryBot.create(:g5_authenticatable_role, resource: other_user)
     end
-    let(:other_user) { FactoryGirl.create(:g5_authenticatable_user) }
+    let(:other_user) { FactoryBot.create(:g5_authenticatable_user) }
 
     it 'should match one role' do
       expect(instance_scoped.count).to eq(1)

data/spec/models/g5_authenticatable/user_spec.rb

@@ -5,7 +5,7 @@ require 'rails_helper'
 RSpec.describe G5Authenticatable::User do
   subject { user }
   let(:user) { G5Authenticatable::User.create(user_attributes) }
-  let(:user_attributes) { FactoryGirl.attributes_for(:g5_authenticatable_user) }
+  let(:user_attributes) { FactoryBot.attributes_for(:g5_authenticatable_user) }
 
   it { is_expected.to have_and_belong_to_many(:roles) }
 
@@ -96,10 +96,10 @@ RSpec.describe G5Authenticatable::User do
     end
 
     let(:new_user_attributes) do
-      FactoryGirl.attributes_for(:g5_authenticatable_user)
+      FactoryBot.attributes_for(:g5_authenticatable_user)
     end
     let(:new_role_attributes) do
-      FactoryGirl.attributes_for(:g5_authenticatable_role)
+      FactoryBot.attributes_for(:g5_authenticatable_role)
     end
 
     it 'has the correct uid' do
@@ -177,10 +177,10 @@ RSpec.describe G5Authenticatable::User do
     end
 
     let(:new_user_attributes) do
-      FactoryGirl.attributes_for(:g5_authenticatable_user)
+      FactoryBot.attributes_for(:g5_authenticatable_user)
     end
     let(:new_role_attributes) do
-      FactoryGirl.attributes_for(:g5_authenticatable_role)
+      FactoryBot.attributes_for(:g5_authenticatable_role)
     end
 
     context 'when there is auth data in the session' do
@@ -280,7 +280,7 @@ RSpec.describe G5Authenticatable::User do
     end
 
     let(:user_attributes) do
-      FactoryGirl.attributes_for(:g5_authenticatable_user,
+      FactoryBot.attributes_for(:g5_authenticatable_user,
                                  first_name: nil,
                                  last_name: nil,
                                  phone_number: nil,
@@ -442,7 +442,7 @@ RSpec.describe G5Authenticatable::User do
     subject(:add_role) { user.add_role(role_name) }
 
     context 'when role already exists' do
-      let(:role) { FactoryGirl.create(:g5_authenticatable_role) }
+      let(:role) { FactoryBot.create(:g5_authenticatable_role) }
       let(:role_name) { role.name }
 
       it 'should assign a role to the user' do
@@ -496,10 +496,10 @@ RSpec.describe G5Authenticatable::User do
 
     let(:user2) { G5Authenticatable::User.create(user_attributes) }
     let(:user_attributes2) do
-      FactoryGirl.attributes_for(:g5_authenticatable_user)
+      FactoryBot.attributes_for(:g5_authenticatable_user)
     end
 
-    let!(:resource) { FactoryGirl.create(:g5_updatable_client) }
+    let!(:resource) { FactoryBot.create(:g5_updatable_client) }
 
     let(:auth_data) do
       OmniAuth::AuthHash.new(

data/spec/models/post_spec.rb

@@ -4,7 +4,7 @@ require 'rails_helper'
 
 RSpec.describe Post do
   subject { post }
-  let(:post) { FactoryGirl.create(:post) }
+  let(:post) { FactoryBot.create(:post) }
 
   it { is_expected.to belong_to(:author) }
 

data/spec/policies/application_policy_spec.rb

@@ -5,8 +5,8 @@ require 'rails_helper'
 RSpec.describe ApplicationPolicy do
   subject(:policy) { described_class }
 
-  let(:user) { FactoryGirl.create(:g5_authenticatable_user) }
-  let(:record) { FactoryGirl.create(:post) }
+  let(:user) { FactoryBot.create(:g5_authenticatable_user) }
+  let(:record) { FactoryBot.create(:post) }
 
   permissions :index? do
     it_behaves_like 'a super_admin authorizer'
@@ -14,14 +14,14 @@ RSpec.describe ApplicationPolicy do
 
   permissions :show? do
     context 'when user is a super_admin' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_super_admin) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_super_admin) }
 
       context 'when record exists in scope' do
         it { is_expected.to permit(user, record) }
       end
 
       context 'when record does not exist in scope' do
-        let(:record) { FactoryGirl.build(:post) }
+        let(:record) { FactoryBot.build(:post) }
 
         it { is_expected.to_not permit(user, record) }
       end
@@ -75,7 +75,7 @@ RSpec.describe ApplicationPolicy do
     end
 
     context 'when user has the super_admin role' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_super_admin) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_super_admin) }
 
       it { is_expected.to eq(true) }
     end
@@ -95,7 +95,7 @@ RSpec.describe ApplicationPolicy do
     end
 
     context 'when user has the admin role' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_admin) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_admin) }
 
       it { is_expected.to eq(true) }
     end
@@ -115,7 +115,7 @@ RSpec.describe ApplicationPolicy do
     end
 
     context 'when user has the editor role' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_editor) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_editor) }
 
       it { is_expected.to eq(true) }
     end
@@ -131,13 +131,13 @@ RSpec.describe ApplicationPolicy do
     end
 
     context 'when user does not have viewer role' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_editor) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_editor) }
 
       it { is_expected.to eq(false) }
     end
 
     context 'when user has the viewer role' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_viewer) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_viewer) }
 
       it { is_expected.to eq(true) }
     end
@@ -147,35 +147,35 @@ RSpec.describe ApplicationPolicy do
     subject(:global_role?) { policy.new(user, record).global_role? }
 
     let(:scoped_role) do
-      FactoryGirl.create(:g5_authenticatable_role, name: role_name,
+      FactoryBot.create(:g5_authenticatable_role, name: role_name,
                                                    resource: resource)
     end
-    let(:resource) { FactoryGirl.create(:g5_updatable_client) }
+    let(:resource) { FactoryBot.create(:g5_updatable_client) }
 
     context 'when there is no user' do
       it { is_expected.to eq(false) }
     end
 
     context 'when the user is a global super admin' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_super_admin) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_super_admin) }
 
       it { is_expected.to eq(true) }
     end
 
     context 'when the user is a global admin' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_admin) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_admin) }
 
       it { is_expected.to eq(true) }
     end
 
     context 'when the user is a global editor' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_editor) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_editor) }
 
       it { is_expected.to eq(true) }
     end
 
     context 'when the user is a global viewer' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_viewer) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_viewer) }
 
       it { is_expected.to eq(true) }
     end

data/spec/policies/client_policy_spec.rb

@@ -5,8 +5,8 @@ require 'rails_helper'
 RSpec.describe G5Updatable::ClientPolicy do
   subject(:policy) { described_class }
 
-  let(:user) { FactoryGirl.create(:g5_authenticatable_user) }
-  let(:user2) { FactoryGirl.create(:g5_authenticatable_user) }
+  let(:user) { FactoryBot.create(:g5_authenticatable_user) }
+  let(:user2) { FactoryBot.create(:g5_authenticatable_user) }
 
   before do
     user.roles = []
@@ -14,9 +14,9 @@ RSpec.describe G5Updatable::ClientPolicy do
     user2.add_role(:viewer, client_1)
   end
 
-  let!(:client_1) { FactoryGirl.create(:g5_updatable_client) }
-  let!(:client_2) { FactoryGirl.create(:g5_updatable_client) }
-  let!(:client_3) { FactoryGirl.create(:g5_updatable_client) }
+  let!(:client_1) { FactoryBot.create(:g5_updatable_client) }
+  let!(:client_2) { FactoryBot.create(:g5_updatable_client) }
+  let!(:client_3) { FactoryBot.create(:g5_updatable_client) }
 
   describe '.resolve' do
     subject do

data/spec/policies/location_policy_spec.rb

@@ -5,24 +5,24 @@ require 'rails_helper'
 RSpec.describe G5Updatable::LocationPolicy do
   subject(:policy) { described_class }
 
-  let(:user) { FactoryGirl.create(:g5_authenticatable_user) }
-  let(:user2) { FactoryGirl.create(:g5_authenticatable_user) }
+  let(:user) { FactoryBot.create(:g5_authenticatable_user) }
+  let(:user2) { FactoryBot.create(:g5_authenticatable_user) }
 
-  let!(:client_1) { FactoryGirl.create(:g5_updatable_client) }
-  let!(:client_2) { FactoryGirl.create(:g5_updatable_client) }
+  let!(:client_1) { FactoryBot.create(:g5_updatable_client) }
+  let!(:client_2) { FactoryBot.create(:g5_updatable_client) }
 
   let!(:location_1) do
-    FactoryGirl.create(:g5_updatable_location, client: client_1)
+    FactoryBot.create(:g5_updatable_location, client: client_1)
   end
   let!(:location_2) do
-    FactoryGirl.create(:g5_updatable_location, client: client_1)
+    FactoryBot.create(:g5_updatable_location, client: client_1)
   end
 
   let!(:location_3) do
-    FactoryGirl.create(:g5_updatable_location, client: client_2)
+    FactoryBot.create(:g5_updatable_location, client: client_2)
   end
   let!(:location_4) do
-    FactoryGirl.create(:g5_updatable_location, client: client_2)
+    FactoryBot.create(:g5_updatable_location, client: client_2)
   end
 
   before do

data/spec/policies/selectable_client_policy_spec.rb

@@ -5,8 +5,8 @@ require 'rails_helper'
 RSpec.describe G5Updatable::SelectableClientPolicy do
   subject(:policy) { described_class }
 
-  let(:user) { FactoryGirl.create(:g5_authenticatable_user) }
-  let(:user2) { FactoryGirl.create(:g5_authenticatable_user) }
+  let(:user) { FactoryBot.create(:g5_authenticatable_user) }
+  let(:user2) { FactoryBot.create(:g5_authenticatable_user) }
 
   before do
     user.roles = []
@@ -14,9 +14,9 @@ RSpec.describe G5Updatable::SelectableClientPolicy do
     user2.add_role(:viewer, client_1)
   end
 
-  let!(:client_1) { FactoryGirl.create(:g5_updatable_client) }
-  let!(:client_2) { FactoryGirl.create(:g5_updatable_client) }
-  let!(:client_3) { FactoryGirl.create(:g5_updatable_client) }
+  let!(:client_1) { FactoryBot.create(:g5_updatable_client) }
+  let!(:client_2) { FactoryBot.create(:g5_updatable_client) }
+  let!(:client_3) { FactoryBot.create(:g5_updatable_client) }
 
   describe '.resolve' do
     subject do
@@ -25,17 +25,17 @@ RSpec.describe G5Updatable::SelectableClientPolicy do
     end
 
     let!(:location_1) do
-      FactoryGirl.create(:g5_updatable_location, client: client_1)
+      FactoryBot.create(:g5_updatable_location, client: client_1)
     end
     let!(:location_2) do
-      FactoryGirl.create(:g5_updatable_location, client: client_1)
+      FactoryBot.create(:g5_updatable_location, client: client_1)
     end
 
     let!(:location_3) do
-      FactoryGirl.create(:g5_updatable_location, client: client_2)
+      FactoryBot.create(:g5_updatable_location, client: client_2)
     end
     let!(:location_4) do
-      FactoryGirl.create(:g5_updatable_location, client: client_2)
+      FactoryBot.create(:g5_updatable_location, client: client_2)
     end
 
     context 'with global role' do

data/spec/requests/default_role_authorization_spec.rb

@@ -8,13 +8,13 @@ RSpec.describe 'Default role-based authorization API' do
   describe 'GET /posts', :auth_request do
     subject(:get_posts) { safe_get posts_path, format: :json }
 
-    let!(:post) { FactoryGirl.create(:post, author: user) }
-    let!(:other_post) { FactoryGirl.create(:post) }
+    let!(:post) { FactoryBot.create(:post, author: user) }
+    let!(:other_post) { FactoryBot.create(:post) }
 
     before { get_posts }
 
     context 'when user is a super_admin' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_super_admin) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_super_admin) }
 
       it 'returns ok' do
         expect(response).to be_ok
@@ -42,12 +42,12 @@ RSpec.describe 'Default role-based authorization API' do
   describe 'GET /posts/:id', :auth_request do
     subject(:show_post) { safe_get post_path(post.id), format: :json }
 
-    let(:post) { FactoryGirl.create(:post, author: user) }
+    let(:post) { FactoryBot.create(:post, author: user) }
 
     before { show_post }
 
     context 'when user is a super_admin' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_super_admin) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_super_admin) }
 
       it 'returns ok' do
         expect(response).to be_ok
@@ -61,7 +61,7 @@ RSpec.describe 'Default role-based authorization API' do
     end
 
     context 'when user is not a super_admin' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_viewer) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_viewer) }
 
       it 'returns forbidden' do
         expect(response).to be_forbidden
@@ -77,10 +77,10 @@ RSpec.describe 'Default role-based authorization API' do
     let(:post_params) do
       { content: post_obj.content, author_id: post_obj.author.id }
     end
-    let(:post_obj) { FactoryGirl.build(:post, author: user) }
+    let(:post_obj) { FactoryBot.build(:post, author: user) }
 
     context 'when user is a super_admin' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_super_admin) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_super_admin) }
 
       it 'returns ok' do
         create_post
@@ -112,10 +112,10 @@ RSpec.describe 'Default role-based authorization API' do
     let(:post_params) do
       { content: 'some brand new content', author_id: post.author.id }
     end
-    let(:post) { FactoryGirl.create(:post, author: user) }
+    let(:post) { FactoryBot.create(:post, author: user) }
 
     context 'when user is a super_admin' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_super_admin) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_super_admin) }
 
       it 'returns ok' do
         update_post
@@ -144,10 +144,10 @@ RSpec.describe 'Default role-based authorization API' do
       safe_delete post_path(post.id), format: :json
     end
 
-    let!(:post) { FactoryGirl.create(:post, author: user) }
+    let!(:post) { FactoryBot.create(:post, author: user) }
 
     context 'when user is a super_admin' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_super_admin) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_super_admin) }
 
       it 'returns ok' do
         delete_post

data/spec/requests/token_validation_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe 'API Token validation' do
     before { G5Authenticatable.strict_token_validation = true }
 
     context 'when user has a valid g5 access token' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_user) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_user) }
 
       before do
         login_user(user)
@@ -29,7 +29,7 @@ RSpec.describe 'API Token validation' do
     end
 
     context 'when user has an invalid g5 access token' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_user) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_user) }
 
       before do
         login_user(user)
@@ -56,7 +56,7 @@ RSpec.describe 'API Token validation' do
     before { G5Authenticatable.strict_token_validation = false }
 
     context 'when the user has an invalid g5 access token' do
-      let(:user) { FactoryGirl.create(:g5_authenticatable_user) }
+      let(:user) { FactoryBot.create(:g5_authenticatable_user) }
 
       before do
         login_user(user)

data/spec/services/g5_authenticatable/impersonate_sessionable_spec.rb

@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe G5Authenticatable::ImpersonateSessionable do
-  let!(:user) { FactoryGirl.create(:g5_authenticatable_user) }
+  let!(:user) { FactoryBot.create(:g5_authenticatable_user) }
 
   class MyImpersponateSessionableTest
     include G5Authenticatable::ImpersonateSessionable
@@ -52,25 +52,25 @@ RSpec.describe G5Authenticatable::ImpersonateSessionable do
 
     context 'having a super admin and any other user' do
       let!(:user) do
-        user = FactoryGirl.create(:g5_authenticatable_user)
+        user = FactoryBot.create(:g5_authenticatable_user)
         user.add_role(:super_admin)
         user
       end
-      let!(:user2) { FactoryGirl.create(:g5_authenticatable_user) }
+      let!(:user2) { FactoryBot.create(:g5_authenticatable_user) }
 
       it { is_expected.to eq(true) }
     end
 
     context 'having an admin' do
       let!(:user) do
-        user = FactoryGirl.create(:g5_authenticatable_user)
+        user = FactoryBot.create(:g5_authenticatable_user)
         user.add_role(:admin)
         user
       end
 
       context 'assuming a super admin' do
         let!(:user2) do
-          user = FactoryGirl.create(:g5_authenticatable_user)
+          user = FactoryBot.create(:g5_authenticatable_user)
           user.add_role(:super_admin)
           user
         end
@@ -80,7 +80,7 @@ RSpec.describe G5Authenticatable::ImpersonateSessionable do
 
       context 'assuming another admin' do
         let!(:user2) do
-          user = FactoryGirl.create(:g5_authenticatable_user)
+          user = FactoryBot.create(:g5_authenticatable_user)
           user.add_role(:admin)
           user
         end
@@ -89,7 +89,7 @@ RSpec.describe G5Authenticatable::ImpersonateSessionable do
       end
 
       context 'assuming a regular user' do
-        let!(:user2) { FactoryGirl.create(:g5_authenticatable_user) }
+        let!(:user2) { FactoryBot.create(:g5_authenticatable_user) }
 
         it { is_expected.to eq(true) }
       end
@@ -97,7 +97,7 @@ RSpec.describe G5Authenticatable::ImpersonateSessionable do
 
     context 'providing no user' do
       context 'when user to impersonate is nil' do
-        let(:user) { FactoryGirl.create(:g5_authenticatable_super_admin) }
+        let(:user) { FactoryBot.create(:g5_authenticatable_super_admin) }
         let(:user2) {}
 
         it { is_expected.to eq(false) }
@@ -105,7 +105,7 @@ RSpec.describe G5Authenticatable::ImpersonateSessionable do
 
       context 'when signed-in user is nil' do
         let(:user) {}
-        let(:user2) { FactoryGirl.create(:g5_authenticatable_user) }
+        let(:user2) { FactoryBot.create(:g5_authenticatable_user) }
 
         it { is_expected.to eq(false) }
       end

data/spec/support/shared_examples/super_admin_authorizer.rb

@@ -2,7 +2,7 @@
 
 RSpec.shared_examples_for 'a super_admin authorizer' do
   context 'when user is an admin' do
-    let(:user) { FactoryGirl.create(:g5_authenticatable_admin) }
+    let(:user) { FactoryBot.create(:g5_authenticatable_admin) }
 
     it 'denies access' do
       expect(policy).to_not permit(user, record)
@@ -10,7 +10,7 @@ RSpec.shared_examples_for 'a super_admin authorizer' do
   end
 
   context 'when user is an editor' do
-    let(:user) { FactoryGirl.create(:g5_authenticatable_editor) }
+    let(:user) { FactoryBot.create(:g5_authenticatable_editor) }
 
     it 'denies access' do
       expect(policy).to_not permit(user, record)
@@ -18,7 +18,7 @@ RSpec.shared_examples_for 'a super_admin authorizer' do
   end
 
   context 'when user is a viewer' do
-    let(:user) { FactoryGirl.create(:g5_authenticatable_user) }
+    let(:user) { FactoryBot.create(:g5_authenticatable_user) }
 
     it 'denies access' do
       expect(policy).to_not permit(user, record)
@@ -26,7 +26,7 @@ RSpec.shared_examples_for 'a super_admin authorizer' do
   end
 
   context 'when user has super_admin role' do
-    let(:user) { FactoryGirl.create(:g5_authenticatable_super_admin) }
+    let(:user) { FactoryBot.create(:g5_authenticatable_super_admin) }
 
     it 'permits access' do
       expect(policy).to permit(user, record)

data/spec/tasks/purge_users_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe 'g5_authenticatable:purge_users' do
   end
 
   context 'when there is one local user' do
-    let!(:user) { FactoryGirl.create(:g5_authenticatable_user) }
+    let!(:user) { FactoryBot.create(:g5_authenticatable_user) }
 
     it 'should delete the user data from the db' do
       expect { task.invoke }.to change { G5Authenticatable::User.count }.from(1).to(0)
@@ -25,8 +25,8 @@ RSpec.describe 'g5_authenticatable:purge_users' do
   end
 
   context 'when there are multiple local users' do
-    let!(:user1) { FactoryGirl.create(:g5_authenticatable_user) }
-    let!(:user2) { FactoryGirl.create(:g5_authenticatable_user) }
+    let!(:user1) { FactoryBot.create(:g5_authenticatable_user) }
+    let!(:user2) { FactoryBot.create(:g5_authenticatable_user) }
 
     it 'should delete the user data from the db' do
       expect { task.invoke }.to change { G5Authenticatable::User.count }.from(2).to(0)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: g5_authenticatable
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - maeve
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-19 00:00:00.000000000 Z
+date: 2017-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise_g5_authenticatable
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"