openstax_accounts 7.8.0 → 7.9.0

data/spec/factories/openstax_accounts_account.rb

@@ -1,10 +1,10 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :openstax_accounts_account, class: OpenStax::Accounts::Account do
-    openstax_uid { -SecureRandom.hex(4).to_i(16)/2 }
-    username     { SecureRandom.hex.to_s }
-    access_token { SecureRandom.hex.to_s }
+    openstax_uid   { -SecureRandom.hex(4).to_i(16)/2 }
+    username       { SecureRandom.hex.to_s }
+    access_token   { SecureRandom.hex.to_s }
     faculty_status { OpenStax::Accounts::Account.faculty_statuses[:no_faculty_info] }
-    role         { OpenStax::Accounts::Account.roles[:unknown_role] }
-    uuid         { SecureRandom.uuid }
+    role           { OpenStax::Accounts::Account.roles[:unknown_role] }
+    uuid           { SecureRandom.uuid }
   end
 end

data/spec/factories/openstax_accounts_group.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :openstax_accounts_group, :class => OpenStax::Accounts::Group do
     openstax_uid { -SecureRandom.hex(4).to_i(16)/2 }
     name "MyGroup"

data/spec/factories/openstax_accounts_group_member.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :openstax_accounts_group_member, :class => OpenStax::Accounts::GroupMember do
     association :group, factory: :openstax_accounts_group
     association :user, factory: :openstax_accounts_account

data/spec/factories/openstax_accounts_group_nesting.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :openstax_accounts_group_nesting, :class => OpenStax::Accounts::GroupNesting do
     association :container_group, factory: :openstax_accounts_group
     association :member_group, factory: :openstax_accounts_group

data/spec/factories/openstax_accounts_group_owner.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :openstax_accounts_group_owner, :class => OpenStax::Accounts::GroupOwner do
     association :group, factory: :openstax_accounts_group
     association :user, factory: :openstax_accounts_account

data/spec/handlers/openstax/accounts/accounts_search_spec.rb

@@ -5,28 +5,28 @@ module OpenStax
 
     describe AccountsSearch do
       
-      let!(:account_1)          { FactoryGirl.create :openstax_accounts_account,
+      let!(:account_1)          { FactoryBot.create :openstax_accounts_account,
                                                   first_name: 'John',
                                                   last_name: 'Stravinsky',
                                                   username: 'jstrav' }
-      let!(:account_2)          { FactoryGirl.create :openstax_accounts_account,
+      let!(:account_2)          { FactoryBot.create :openstax_accounts_account,
                                                   first_name: 'Mary',
                                                   last_name: 'Mighty',
                                                   full_name: 'Mary Mighty',
                                                   username: 'mary' }
-      let!(:account_3)          { FactoryGirl.create :openstax_accounts_account,
+      let!(:account_3)          { FactoryBot.create :openstax_accounts_account,
                                                   first_name: 'John',
                                                   last_name: 'Stead',
                                                   username: 'jstead' }
 
-      let!(:account_4)          { FactoryGirl.create :openstax_accounts_account,
+      let!(:account_4)          { FactoryBot.create :openstax_accounts_account,
                                                   first_name: 'Bob',
                                                   last_name: 'JST',
                                                   username: 'bigbear' }
 
       let!(:billy_accounts) {
         (0..49).to_a.collect{|ii|
-          FactoryGirl.create :openstax_accounts_account,
+          FactoryBot.create :openstax_accounts_account,
                              first_name: "Billy#{ii.to_s.rjust(2, '0')}",
                              last_name: "Bob_#{(49-ii).to_s.rjust(2,'0')}",
                              username: "billy_#{ii.to_s.rjust(2, '0')}"

data/spec/handlers/openstax/accounts/dev/accounts_search_spec.rb

@@ -5,28 +5,28 @@ module OpenStax
 
     describe Dev::AccountsSearch do
       
-      let!(:account_1)          { FactoryGirl.create :openstax_accounts_account,
+      let!(:account_1)          { FactoryBot.create :openstax_accounts_account,
                                                   first_name: 'John',
                                                   last_name: 'Stravinsky',
                                                   username: 'jstrav' }
-      let!(:account_2)          { FactoryGirl.create :openstax_accounts_account,
+      let!(:account_2)          { FactoryBot.create :openstax_accounts_account,
                                                   first_name: 'Mary',
                                                   last_name: 'Mighty',
                                                   full_name: 'Mary Mighty',
                                                   username: 'mary' }
-      let!(:account_3)          { FactoryGirl.create :openstax_accounts_account,
+      let!(:account_3)          { FactoryBot.create :openstax_accounts_account,
                                                   first_name: 'John',
                                                   last_name: 'Stead',
                                                   username: 'jstead' }
 
-      let!(:account_4)          { FactoryGirl.create :openstax_accounts_account,
+      let!(:account_4)          { FactoryBot.create :openstax_accounts_account,
                                                   first_name: 'Bob',
                                                   last_name: 'JST',
                                                   username: 'bigbear' }
 
       let!(:billy_accounts) {
         (0..49).to_a.collect{|ii|
-          FactoryGirl.create :openstax_accounts_account,
+          FactoryBot.create :openstax_accounts_account,
                              first_name: "Billy#{ii.to_s.rjust(2, '0')}",
                              last_name: "Bob_#{(49-ii).to_s.rjust(2,'0')}",
                              username: "billy_#{ii.to_s.rjust(2, '0')}"

data/spec/handlers/openstax/accounts/sessions_callback_spec.rb

@@ -31,8 +31,9 @@ module OpenStax
 
       context "uuid" do
         it "sets the UUID on the account" do
-          result = described_class.handle(request: mock_omniauth_request(uuid: "howdy_ho"))
-          expect(result.outputs.account.uuid).to eq "howdy_ho"
+          uuid = SecureRandom.uuid
+          result = described_class.handle(request: mock_omniauth_request(uuid: uuid))
+          expect(result.outputs.account.uuid).to eq uuid
         end
       end
 
@@ -50,7 +51,8 @@ module OpenStax
 
       context "user exists" do
         it "updates the user's data" do
-          existing_account = FactoryGirl.create :openstax_accounts_account
+          existing_account = FactoryBot.create :openstax_accounts_account
+          uuid = SecureRandom.uuid
           result = described_class.handle(
             request: mock_omniauth_request(
               uid: existing_account.openstax_uid,
@@ -59,7 +61,7 @@ module OpenStax
               title: "900",
               nickname: "191919",
               faculty_status: "confirmed_faculty",
-              uuid: "yoyoma",
+              uuid: uuid,
               self_reported_role: "instructor")
           )
 
@@ -70,7 +72,7 @@ module OpenStax
           expect(account.title).to eq "900"
           expect(account.username).to eq "191919"
           expect(account).to be_confirmed_faculty
-          expect(account.uuid).to eq "yoyoma"
+          expect(account.uuid).to eq uuid
           expect(account).to be_instructor
         end
       end

data/spec/lib/openstax/accounts/api_spec.rb

@@ -23,7 +23,7 @@ module OpenStax
 
       context 'users' do
         before(:each) { reset(::Api::UsersController) }
-        let!(:account) { FactoryGirl.create :openstax_accounts_account }
+        let!(:account) { FactoryBot.create :openstax_accounts_account }
 
         it 'makes api call to users index' do
           Api.search_accounts('something')
@@ -89,8 +89,8 @@ module OpenStax
       context 'groups' do
         before(:each) { reset(::Api::GroupsController) }
 
-        let!(:account) { FactoryGirl.create :openstax_accounts_account }
-        let!(:group)   { FactoryGirl.create :openstax_accounts_group }
+        let!(:account) { FactoryBot.create :openstax_accounts_account }
+        let!(:group)   { FactoryBot.create :openstax_accounts_group }
 
         it 'makes api call to groups create' do
           Api.create_group(account, group)
@@ -121,8 +121,8 @@ module OpenStax
       context 'group_members' do
         before(:each) { reset(::Api::GroupMembersController) }
 
-        let!(:account) { FactoryGirl.create :openstax_accounts_account }
-        let!(:group_member)   { FactoryGirl.build :openstax_accounts_group_member }
+        let!(:account) { FactoryBot.create :openstax_accounts_account }
+        let!(:group_member)   { FactoryBot.build :openstax_accounts_group_member }
 
         it 'makes api call to group_members create' do
           Api.create_group_member(account, group_member)
@@ -145,8 +145,8 @@ module OpenStax
       context 'group_owners' do
         before(:each) { reset(::Api::GroupOwnersController) }
 
-        let!(:account)      { FactoryGirl.create :openstax_accounts_account }
-        let!(:group_owner) { FactoryGirl.build :openstax_accounts_group_owner }
+        let!(:account)      { FactoryBot.create :openstax_accounts_account }
+        let!(:group_owner) { FactoryBot.build :openstax_accounts_group_owner }
 
         it 'makes api call to group_owners create' do
           Api.create_group_owner(account, group_owner)
@@ -169,8 +169,8 @@ module OpenStax
       context 'group_nestings' do
         before(:each) { reset(::Api::GroupNestingsController) }
 
-        let!(:account)      { FactoryGirl.create :openstax_accounts_account }
-        let!(:group_nesting) { FactoryGirl.build :openstax_accounts_group_nesting }
+        let!(:account)      { FactoryBot.create :openstax_accounts_account }
+        let!(:group_nesting) { FactoryBot.build :openstax_accounts_group_nesting }
 
         it 'makes api call to group_nestings (create)' do
           Api.create_group_nesting(account, group_nesting)

data/spec/lib/openstax/accounts/current_user_manager_spec.rb

@@ -1,7 +1,7 @@
 module OpenStax
   module Accounts
     describe CurrentUserManager do
-      let!(:account) { FactoryGirl.create(:openstax_accounts_account,
+      let!(:account) { FactoryBot.create(:openstax_accounts_account,
                          username: 'some_user',
                          openstax_uid: 1) }
       let!(:user)    { User.create(:account => account) }

data/spec/lib/openstax/accounts/has_many_through_groups/active_record/base_spec.rb

@@ -3,17 +3,17 @@ module OpenStax
     module HasManyThroughGroups
       module ActiveRecord
         describe Base do
-          let!(:account_1) { FactoryGirl.create(:openstax_accounts_account,
+          let!(:account_1) { FactoryBot.create(:openstax_accounts_account,
                              username: 'some_user',
                              openstax_uid: 1) }
           let!(:user_1)    { User.create(:account => account_1) }
 
-          let!(:account_2) { FactoryGirl.create(:openstax_accounts_account,
+          let!(:account_2) { FactoryBot.create(:openstax_accounts_account,
                              username: 'another_user',
                              openstax_uid: 2) }
           let!(:user_2)    { User.create(:account => account_2) }
 
-          let!(:group_nesting) { FactoryGirl.create(:openstax_accounts_group_nesting) }
+          let!(:group_nesting) { FactoryBot.create(:openstax_accounts_group_nesting) }
 
           before(:each) do
             group_nesting.member_group.add_member(account_1)

data/spec/models/openstax/accounts/account_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module OpenStax::Accounts
   RSpec.describe Account do
-    subject(:account) { FactoryGirl.create(:openstax_accounts_account) }
+    subject(:account) { FactoryBot.create(:openstax_accounts_account) }
 
     context 'validation' do
       it 'requires a unique openstax_uid, if given' do
@@ -12,7 +12,7 @@ module OpenStax::Accounts
         account.openstax_uid = -1
         account.save!
 
-        account_2 = FactoryGirl.build(:openstax_accounts_account, openstax_uid: -1)
+        account_2 = FactoryBot.build(:openstax_accounts_account, openstax_uid: -1)
         expect(account_2).not_to be_valid
         expect(account_2.errors[:openstax_uid]).to eq(['has already been taken'])
       end
@@ -24,20 +24,20 @@ module OpenStax::Accounts
 
       it 'requires unique username if not nil' do
         expect{
-          FactoryGirl.create(:openstax_accounts_account, username: account.username)
+          FactoryBot.create(:openstax_accounts_account, username: account.username)
         }.to raise_error(ActiveRecord::RecordInvalid)
       end
 
       it 'allows multiple accounts saved with nil username' do
-        FactoryGirl.create(:openstax_accounts_account, username: nil)
+        FactoryBot.create(:openstax_accounts_account, username: nil)
         expect{
-          FactoryGirl.create(:openstax_accounts_account, username: nil)
+          FactoryBot.create(:openstax_accounts_account, username: nil)
         }.not_to raise_error
       end
 
       it 'requires a role' do
         expect{
-          FactoryGirl.create(:openstax_accounts_account, role: nil)
+          FactoryBot.create(:openstax_accounts_account, role: nil)
         }.to raise_error(ActiveRecord::RecordInvalid)
       end
     end

data/spec/models/openstax/accounts/group_spec.rb

@@ -4,14 +4,14 @@ module OpenStax::Accounts
   describe Group do
     context 'validation' do
       it 'requires a unique openstax_uid' do
-        group = FactoryGirl.build(:openstax_accounts_group, openstax_uid: nil)
+        group = FactoryBot.build(:openstax_accounts_group, openstax_uid: nil)
         expect(group).not_to be_valid
         expect(group.errors[:openstax_uid]).to eq(['can\'t be blank'])
 
         group.openstax_uid = 1
         group.save!
 
-        group_2 = FactoryGirl.build(:openstax_accounts_group, openstax_uid: 1)
+        group_2 = FactoryBot.build(:openstax_accounts_group, openstax_uid: 1)
         expect(group_2).not_to be_valid
         expect(group_2.errors[:openstax_uid]).to eq(['has already been taken'])
       end
@@ -25,9 +25,9 @@ module OpenStax::Accounts
 
       after(:all)      { OpenStax::Accounts.configuration.enable_stubbing = @stubbing }
 
-      let!(:requestor) { FactoryGirl.create(:openstax_accounts_account) }
+      let!(:requestor) { FactoryBot.create(:openstax_accounts_account) }
       let!(:group)     do
-        FactoryGirl.build(:openstax_accounts_group).tap{ |group| group.requestor = requestor }
+        FactoryBot.build(:openstax_accounts_group).tap{ |group| group.requestor = requestor }
       end
 
       it 'calls OpenStax Accounts when created' do

data/spec/routines/openstax/accounts/create_group_spec.rb

@@ -10,7 +10,7 @@ module OpenStax
         OpenStax::Accounts.configuration.enable_stubbing = true
       end
 
-      let!(:owner) { FactoryGirl.create :openstax_accounts_account }
+      let!(:owner) { FactoryBot.create :openstax_accounts_account }
 
       it 'can create groups' do
         group = CreateGroup[owner: owner, name: 'Test', is_public: true]

data/spec/routines/openstax/accounts/search_accounts_spec.rb

@@ -5,21 +5,21 @@ module OpenStax
 
     describe SearchAccounts, type: :routine do
 
-      let!(:account_1)          { FactoryGirl.create :openstax_accounts_account,
+      let!(:account_1)          { FactoryBot.create :openstax_accounts_account,
                                                   first_name: 'John',
                                                   last_name: 'Stravinsky',
                                                   username: 'jstrav' }
-      let!(:account_2)          { FactoryGirl.create :openstax_accounts_account,
+      let!(:account_2)          { FactoryBot.create :openstax_accounts_account,
                                                   first_name: 'Mary',
                                                   last_name: 'Mighty',
                                                   full_name: 'Mary Mighty',
                                                   username: 'mary' }
-      let!(:account_3)          { FactoryGirl.create :openstax_accounts_account,
+      let!(:account_3)          { FactoryBot.create :openstax_accounts_account,
                                                   first_name: 'John',
                                                   last_name: 'Stead',
                                                   username: 'jstead' }
 
-      let!(:account_4)          { FactoryGirl.create :openstax_accounts_account,
+      let!(:account_4)          { FactoryBot.create :openstax_accounts_account,
                                                   first_name: 'Bob',
                                                   last_name: 'JST',
                                                   username: 'bigbear' }
@@ -78,7 +78,7 @@ module OpenStax
 
         let!(:billy_accounts) {
           (0..45).to_a.collect{|ii|
-            FactoryGirl.create :openstax_accounts_account,
+            FactoryBot.create :openstax_accounts_account,
                                first_name: "Billy#{ii.to_s.rjust(2, '0')}",
                                last_name: "Bob_#{(45-ii).to_s.rjust(2,'0')}",
                                username: "billy_#{ii.to_s.rjust(2, '0')}"
@@ -88,30 +88,30 @@ module OpenStax
         it "should return the first page of values by default when requested" do
           outcome = SearchAccounts.call("username:billy", per_page: 20).outputs.items
           expect(outcome.length).to eq 20
-          expect(outcome[0]).to eq Account.where{username.eq "billy_00"}.first
-          expect(outcome[19]).to eq Account.where{username.eq "billy_19"}.first
+          expect(outcome[0]).to eq Account.find_by!(username: "billy_00")
+          expect(outcome[19]).to eq Account.find_by!(username: "billy_19")
         end
 
         it "should return the second page when requested" do
           outcome = SearchAccounts.call("username:billy", page: 2, per_page: 20).outputs.items
           expect(outcome.length).to eq 20
-          expect(outcome[0]).to eq Account.where{username.eq "billy_20"}.first
-          expect(outcome[19]).to eq Account.where{username.eq "billy_39"}.first
+          expect(outcome[0]).to eq Account.find_by!(username: "billy_20")
+          expect(outcome[19]).to eq Account.find_by!(username: "billy_39")
         end
 
         it "should return the incomplete 3rd page when requested" do
           outcome = SearchAccounts.call("username:billy", page: 3, per_page: 20).outputs.items
           expect(outcome.length).to eq 6
-          expect(outcome[5]).to eq Account.where{username.eq "billy_45"}.first
+          expect(outcome[5]).to eq Account.find_by!(username: "billy_45")
         end
 
       end
 
       context "sorting" do
 
-        let!(:bob_brown) { FactoryGirl.create :openstax_accounts_account, first_name: "Bob", last_name: "Brown", username: "foo_bb" }
-        let!(:bob_jones) { FactoryGirl.create :openstax_accounts_account, first_name: "Bob", last_name: "Jones", username: "foo_bj" }
-        let!(:tim_jones) { FactoryGirl.create :openstax_accounts_account, first_name: "Tim", last_name: "Jones", username: "foo_tj" }
+        let!(:bob_brown) { FactoryBot.create :openstax_accounts_account, first_name: "Bob", last_name: "Brown", username: "foo_bb" }
+        let!(:bob_jones) { FactoryBot.create :openstax_accounts_account, first_name: "Bob", last_name: "Jones", username: "foo_bj" }
+        let!(:tim_jones) { FactoryBot.create :openstax_accounts_account, first_name: "Tim", last_name: "Jones", username: "foo_tj" }
 
         it "should allow sort by multiple fields in different directions" do
           outcome = SearchAccounts.call("username:foo", order_by: "first_name, last_name DESC").outputs.items

data/spec/routines/openstax/accounts/sync_accounts_spec.rb

@@ -7,14 +7,33 @@ module OpenStax
 
       it 'can sync accounts' do
         controller_class = ::Api::ApplicationUsersController
+        uuid = SecureRandom.uuid
         allow_any_instance_of(controller_class).to(
           receive(:updates) do |controller|
-            controller.render :json => [{id: 1, application_id: 1,
-                                        user: {id: 2, username: 'user', self_reported_role: 'instructor', uuid: 'booyah'},
-                                        unread_updates: 1, default_contact_info_id: 1},
-                                        {id: 3, application_id: 1,
-                                        user: {id: 4, username: 'fuego'},
-                                        unread_updates: 2, default_contact_info_id: 5}]
+            controller.render json: [
+              {
+                id: 1,
+                application_id: 1,
+                user: {
+                  id: 2,
+                  username: 'user',
+                  self_reported_role: 'instructor',
+                  uuid: uuid
+                },
+                unread_updates: 1,
+                default_contact_info_id: 1
+              },
+              {
+                id: 3,
+                application_id: 1,
+                user: {
+                  id: 4,
+                  username: 'fuego'
+                },
+                unread_updates: 2,
+                default_contact_info_id: 5
+              }
+            ]
           end
         )
 
@@ -37,7 +56,7 @@ module OpenStax
           expect(Account.first.openstax_uid).to eq 2
           expect(Account.first.username).to eq 'user'
           expect(Account.first.role).to eq 'instructor'
-          expect(Account.first.uuid).to eq 'booyah'
+          expect(Account.first.uuid).to eq uuid
           expect(Account.last.openstax_uid).to eq 4
           expect(Account.last.username).to eq 'fuego'
 

data/spec/routines/openstax/accounts/sync_groups_spec.rb

@@ -9,20 +9,57 @@ module OpenStax
         controller_class = ::Api::ApplicationGroupsController
         allow_any_instance_of(controller_class).to(
           receive(:updates) do |controller|
-            controller.render :json => [{id: 1, application_id: 1,
-                                         group: {id: 2, name: 'M', members: [], owners: [],
-                                                 nestings: [{container_group_id: 2,
-                                                             member_group_id: 3}]},
-                                         unread_updates: 1, default_contact_info_id: 1},
-                                        {id: 3, application_id: 1,
-                                         group: {id: 3, name: 'Fuego\'s Deputies',
-                                                 members: [{group_id: 3,
-                                                            user: {id: 2, username: 'User'}}],
-                                                 owners: [{group_id: 3,
-                                                           user: {id: 3, username: 'Fuego'}}],
-                                                 nestings: []},
-                                         unread_updates: 2, default_contact_info_id: 5}]
-          end)
+            controller.render json: [
+              {
+                id: 1,
+                application_id: 1,
+                group: {
+                  id: 2,
+                  name: 'M',
+                  members: [],
+                  owners: [],
+                  nestings: [
+                    {
+                      container_group_id: 2,
+                      member_group_id: 3
+                    }
+                  ]
+                },
+                unread_updates: 1,
+                default_contact_info_id: 1
+              },
+              {
+                id: 3,
+                application_id: 1,
+                group: {
+                  id: 3,
+                  name: 'Fuego\'s Deputies',
+                  members: [
+                    {
+                      group_id: 3,
+                      user: {
+                        id: 2,
+                        username: 'User'
+                      }
+                    }
+                  ],
+                  owners: [
+                    {
+                      group_id: 3,
+                      user: {
+                        id: 3,
+                        username: 'Fuego'
+                      }
+                    }
+                  ],
+                  nestings: []
+                },
+                unread_updates: 2,
+                default_contact_info_id: 5
+              }
+            ]
+          end
+        )
 
         u = OpenStax::Accounts::Account.new
         u.openstax_uid = 2