openstax_accounts 7.10.0 → 7.12.0

data/spec/factories/openstax_accounts_account.rb

@@ -7,5 +7,6 @@ FactoryBot.define do
     role               { OpenStax::Accounts::Account.roles[:unknown_role] }
     uuid               { SecureRandom.uuid }
     support_identifier { "cs_#{SecureRandom.hex(4)}" }
+    is_test            true
   end
 end

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

@@ -0,0 +1,160 @@
+require 'spec_helper'
+
+RSpec.shared_examples 'search accounts' do
+
+  let!(:account_1) do
+    FactoryBot.create :openstax_accounts_account, first_name: 'John',
+                                                  last_name: 'Stravinsky',
+                                                  username: 'jstrav'
+  end
+  let!(:account_2) do
+    FactoryBot.create :openstax_accounts_account, first_name: 'Mary',
+                                                  last_name: 'Mighty',
+                                                  full_name: 'Mary Mighty',
+                                                  username: 'mary'
+  end
+  let!(:account_3) do
+    FactoryBot.create :openstax_accounts_account, first_name: 'John',
+                                                  last_name: 'Stead',
+                                                  username: 'jstead'
+  end
+
+  let!(:account_4) do
+    FactoryBot.create :openstax_accounts_account, first_name: 'Bob',
+                                                  last_name: 'JST',
+                                                  username: 'bigbear'
+  end
+
+  it 'should match based on username' do
+    outcome = described_class.call('username:jstra').outputs.items
+    expect(outcome).to eq [account_1]
+  end
+
+  it 'should ignore leading wildcards on username searches' do
+    outcome = described_class.call('username:%rav').outputs.items
+    expect(outcome).to eq []
+  end
+
+  it 'should match based on one first name' do
+    outcome = described_class.call('first_name:"John"').outputs.items
+    expect(outcome).to eq [account_3, account_1]
+  end
+
+  it 'should match based on one full name' do
+    outcome = described_class.call('full_name:"Mary Mighty"').outputs.items
+    expect(outcome).to eq [account_2]
+  end
+
+  it 'should match based on id (openstax_uid)' do
+    outcome = described_class.call("id:#{account_3.openstax_uid}").outputs.items
+    expect(outcome).to eq [account_3]
+  end
+
+  it 'should match based on uuid' do
+    outcome = described_class.call("uuid:#{account_3.uuid}").outputs.items
+    expect(outcome).to eq [account_3]
+  end
+
+  it 'should match based on support_identifier' do
+    outcome = described_class.call(
+      "support_identifier:#{account_3.support_identifier}"
+    ).outputs.items
+    expect(outcome).to eq [account_3]
+  end
+
+  it 'should return all results if the query is empty' do
+    outcome = described_class.call('').outputs.items
+    expect(outcome).to eq [account_4, account_3, account_1, account_2]
+  end
+
+  it 'should match any field when no prefix given' do
+    outcome = described_class.call('jst').outputs.items
+    expect(outcome).to eq [account_4, account_3, account_1]
+  end
+
+  it 'should match any field when no prefix given and intersect when prefix given' do
+    outcome = described_class.call('jst username:jst').outputs.items
+    expect(outcome).to eq [account_3, account_1]
+  end
+
+  it 'shouldn\'t allow users to add their own wildcards' do
+    outcome = described_class.call("username:'%ar'").outputs.items
+    expect(outcome).to eq []
+  end
+
+  it 'should gather comma-separated unprefixed search terms' do
+    outcome = described_class.call('john,mighty').outputs.items
+    expect(outcome).to eq [account_3, account_1, account_2]
+  end
+
+  it 'should not gather space-separated unprefixed search terms' do
+    outcome = described_class.call('john mighty').outputs.items
+    expect(outcome).to eq []
+  end
+
+  context 'pagination and sorting' do
+
+    let!(:billy_accounts) do
+      (0..45).to_a.map do |ii|
+        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')}"
+      end
+    end
+
+    it 'should return the first page of values by default when requested' do
+      outcome = described_class.call('username:billy', per_page: 20).outputs.items
+      expect(outcome.length).to eq 20
+      expect(outcome[0]).to eq OpenStax::Accounts::Account.find_by!(username: 'billy_00')
+      expect(outcome[19]).to eq OpenStax::Accounts::Account.find_by!(username: 'billy_19')
+    end
+
+    it 'should return the second page when requested' do
+      outcome = described_class.call('username:billy', page: 2, per_page: 20).outputs.items
+      expect(outcome.length).to eq 20
+      expect(outcome[0]).to eq OpenStax::Accounts::Account.find_by!(username: 'billy_20')
+      expect(outcome[19]).to eq OpenStax::Accounts::Account.find_by!(username: 'billy_39')
+    end
+
+    it 'should return the incomplete 3rd page when requested' do
+      outcome = described_class.call('username:billy', page: 3, per_page: 20).outputs.items
+      expect(outcome.length).to eq 6
+      expect(outcome[5]).to eq OpenStax::Accounts::Account.find_by!(username: 'billy_45')
+    end
+
+  end
+
+  context 'sorting' do
+
+    let!(:bob_brown) do
+      FactoryBot.create :openstax_accounts_account, first_name: 'Bob',
+                                                    last_name: 'Brown',
+                                                    username: 'foo_bb'
+    end
+    let!(:bob_jones) do
+      FactoryBot.create :openstax_accounts_account, first_name: 'Bob',
+                                                    last_name: 'Jones',
+                                                    username: 'foo_bj'
+    end
+    let!(:tim_jones) do
+      FactoryBot.create :openstax_accounts_account, first_name: 'Tim',
+                                                    last_name: 'Jones',
+                                                    username: 'foo_tj'
+    end
+
+    it 'should allow sort by multiple fields in different directions' do
+      outcome = described_class.call(
+        'username:foo', order_by: 'first_name, last_name DESC'
+      ).outputs.items
+      expect(outcome).to eq [bob_jones, bob_brown, tim_jones]
+
+      outcome = described_class.call(
+        'username:foo', order_by: 'first_name, last_name ASC'
+      ).outputs.items
+      expect(outcome).to eq [bob_brown, bob_jones, tim_jones]
+    end
+
+  end
+
+end

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

@@ -1,129 +1,6 @@
 require 'spec_helper'
+require_relative 'search_accounts_shared_examples'
 
-module OpenStax
-  module Accounts
-
-    RSpec.describe SearchAccounts, type: :routine do
-
-      let!(:account_1)          { FactoryBot.create :openstax_accounts_account,
-                                                  first_name: 'John',
-                                                  last_name: 'Stravinsky',
-                                                  username: 'jstrav' }
-      let!(:account_2)          { FactoryBot.create :openstax_accounts_account,
-                                                  first_name: 'Mary',
-                                                  last_name: 'Mighty',
-                                                  full_name: 'Mary Mighty',
-                                                  username: 'mary' }
-      let!(:account_3)          { FactoryBot.create :openstax_accounts_account,
-                                                  first_name: 'John',
-                                                  last_name: 'Stead',
-                                                  username: 'jstead' }
-
-      let!(:account_4)          { FactoryBot.create :openstax_accounts_account,
-                                                  first_name: 'Bob',
-                                                  last_name: 'JST',
-                                                  username: 'bigbear' }
-
-      it "should match based on username" do
-        outcome = SearchAccounts.call('username:jstra').outputs.items
-        expect(outcome).to eq [account_1]
-      end
-
-      it "should ignore leading wildcards on username searches" do
-        outcome = SearchAccounts.call('username:%rav').outputs.items
-        expect(outcome).to eq []
-      end
-
-      it "should match based on one first name" do
-        outcome = SearchAccounts.call('first_name:"John"').outputs.items
-        expect(outcome).to eq [account_3, account_1]
-      end
-
-      it "should match based on one full name" do
-        outcome = SearchAccounts.call('full_name:"Mary Mighty"').outputs.items
-        expect(outcome).to eq [account_2]
-      end
-
-      it "should return all results if the query is empty" do
-        outcome = SearchAccounts.call("").outputs.items
-        expect(outcome).to eq [account_4, account_3, account_1, account_2]
-      end
-
-      it "should match any field when no prefix given" do
-        outcome = SearchAccounts.call("jst").outputs.items
-        expect(outcome).to eq [account_4, account_3, account_1]
-      end
-
-      it "should match any field when no prefix given and intersect when prefix given" do
-        outcome = SearchAccounts.call("jst username:jst").outputs.items
-        expect(outcome).to eq [account_3, account_1]
-      end
-
-      it "shouldn't allow users to add their own wildcards" do
-        outcome = SearchAccounts.call("username:'%ar'").outputs.items
-        expect(outcome).to eq []
-      end
-
-      it "should gather comma-separated unprefixed search terms" do
-        outcome = SearchAccounts.call("john,mighty").outputs.items
-        expect(outcome).to eq [account_3, account_1, account_2]
-      end
-
-      it "should not gather space-separated unprefixed search terms" do
-        outcome = SearchAccounts.call("john mighty").outputs.items
-        expect(outcome).to eq []
-      end
-
-      context "pagination and sorting" do
-
-        let!(:billy_accounts) {
-          (0..45).to_a.collect{|ii|
-            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')}"
-          }
-        }
-
-        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.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.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.find_by!(username: "billy_45")
-        end
-
-      end
-
-      context "sorting" do
-
-        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
-          expect(outcome).to eq [bob_jones, bob_brown, tim_jones]
-
-          outcome = SearchAccounts.call("username:foo", order_by: "first_name, last_name ASC").outputs.items
-          expect(outcome).to eq [bob_brown, bob_jones, tim_jones]
-        end
-
-      end
-
-    end
-
-  end
+RSpec.describe OpenStax::Accounts::SearchAccounts, type: :routine do
+  include_examples 'search accounts'
 end

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

@@ -0,0 +1,6 @@
+require 'spec_helper'
+require_relative 'search_accounts_shared_examples'
+
+RSpec.describe OpenStax::Accounts::SearchLocalAccounts, type: :routine do
+  include_examples 'search accounts'
+end

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

@@ -20,9 +20,10 @@ module OpenStax
                 user: {
                   id: 2,
                   username: 'user',
+                  self_reported_role: 'instructor',
                   uuid: uuid_1,
                   support_identifier: support_identifier_1,
-                  self_reported_role: 'instructor'
+                  is_test: true
                 },
                 unread_updates: 1,
                 default_contact_info_id: 1
@@ -32,9 +33,9 @@ module OpenStax
                 application_id: 1,
                 user: {
                   id: 4,
+                  username: 'fuego',
                   uuid: uuid_2,
-                  support_identifier: support_identifier_2,
-                  username: 'fuego'
+                  support_identifier: support_identifier_2
                 },
                 unread_updates: 2,
                 default_contact_info_id: 5
@@ -57,16 +58,18 @@ module OpenStax
 
           expect { SyncAccounts.call }.to change { Account.count }.by(1)
 
-          account2 = Account.find_by(openstax_uid: 4)
+          account_2 = Account.find_by(openstax_uid: 4)
 
           expect(account.reload.openstax_uid).to eq 2
           expect(account.username).to eq 'user'
           expect(account.role).to eq 'instructor'
           expect(account.uuid).to eq uuid_1
           expect(account.support_identifier).to eq support_identifier_1
-          expect(account2.username).to eq 'fuego'
-          expect(account2.uuid).to eq uuid_2
-          expect(account2.support_identifier).to eq support_identifier_2
+          expect(account.is_test).to eq true
+          expect(account_2.username).to eq 'fuego'
+          expect(account_2.uuid).to eq uuid_2
+          expect(account_2.support_identifier).to eq support_identifier_2
+          expect(account_2.is_test).to be_nil
 
           expect(controller_class.last_action).to eq :updated
           expect(controller_class.last_json).to eq [
@@ -80,8 +83,8 @@ module OpenStax
 
           expect(account.reload.openstax_uid).to eq 2
           expect(account.username).to eq 'user'
-          expect(account2.reload.openstax_uid).to eq 4
-          expect(account2.username).to eq 'fuego'
+          expect(account_2.reload.openstax_uid).to eq 4
+          expect(account_2.username).to eq 'fuego'
 
           expect(controller_class.last_action).to eq :updated
           expect(controller_class.last_json).to eq [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstax_accounts
 version: !ruby/object:Gem::Version
-  version: 7.10.0
+  version: 7.12.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2017-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
@@ -364,6 +370,7 @@ files:
 - db/migrate/0_create_openstax_accounts_accounts.rb
 - db/migrate/10_assign_missing_uuids_for_local_accounts.rb
 - db/migrate/11_add_support_identifier_to_accounts_accounts.rb
+- db/migrate/12_add_is_test_to_accounts_accounts.rb
 - db/migrate/1_create_openstax_accounts_groups.rb
 - db/migrate/2_create_openstax_accounts_group_members.rb
 - db/migrate/3_create_openstax_accounts_group_owners.rb
@@ -462,7 +469,9 @@ files:
 - spec/models/openstax/accounts/group_spec.rb
 - spec/routines/openstax/accounts/create_group_spec.rb
 - spec/routines/openstax/accounts/find_or_create_account_spec.rb
+- spec/routines/openstax/accounts/search_accounts_shared_examples.rb
 - spec/routines/openstax/accounts/search_accounts_spec.rb
+- spec/routines/openstax/accounts/search_local_accounts_spec.rb
 - spec/routines/openstax/accounts/sync_accounts_spec.rb
 - spec/routines/openstax/accounts/sync_groups_spec.rb
 - spec/spec_helper.rb
@@ -552,6 +561,8 @@ test_files:
 - spec/routines/openstax/accounts/create_group_spec.rb
 - spec/routines/openstax/accounts/sync_accounts_spec.rb
 - spec/routines/openstax/accounts/find_or_create_account_spec.rb
+- spec/routines/openstax/accounts/search_local_accounts_spec.rb
+- spec/routines/openstax/accounts/search_accounts_shared_examples.rb
 - spec/routines/openstax/accounts/sync_groups_spec.rb
 - spec/routines/openstax/accounts/search_accounts_spec.rb
 - spec/vcr_helper.rb