openstax_accounts 7.12.0 → 7.13.0

data/spec/factories/openstax_accounts_account.rb

@@ -5,6 +5,7 @@ FactoryBot.define do
     access_token       { SecureRandom.hex.to_s }
     faculty_status     { OpenStax::Accounts::Account.faculty_statuses[:no_faculty_info] }
     role               { OpenStax::Accounts::Account.roles[:unknown_role] }
+    school_type        { OpenStax::Accounts::Account.school_types[:unknown_school_type] }
     uuid               { SecureRandom.uuid }
     support_identifier { "cs_#{SecureRandom.hex(4)}" }
     is_test            true

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

@@ -5,30 +5,13 @@ module OpenStax
 
     RSpec.describe SessionsCallback do
 
-      context "faculty_status" do
-        it "should default to no_faculty_info if the received faculty_status is unknown" +
-           " (e.g. if Accounts is updated but this repo is not)" do
-          result = described_class.handle(
-            request: mock_omniauth_request(faculty_status: "howdy_ho")
-          )
-          expect(result.outputs.account).to be_no_faculty_info
-        end
-
-        it "should default to no_faculty_info if faculty status is not present" do
-          request = mock_omniauth_request()
-          remove_faculty_status!(request)
+      it "deals with null faculty_status" do
+        with_stubbing(false) do
+          request = mock_omniauth_request
+          remove_nickname!(request)
           result = described_class.handle(request: request)
-          expect(result.outputs.account).to be_no_faculty_info
-        end
-
-        it "should deal with null nicknames" do
-          with_stubbing(false) do
-            request = mock_omniauth_request
-            remove_nickname!(request)
-            result = described_class.handle(request: request)
-            expect(result.outputs.account).to be_valid
-            expect(result.outputs.account).to be_persisted
-          end
+          expect(result.outputs.account).to be_valid
+          expect(result.outputs.account).to be_persisted
         end
       end
 
@@ -50,12 +33,29 @@ module OpenStax
         end
       end
 
+      context "faculty_status" do
+        it "defaults to no_faculty_info if the received faculty_status is unknown" +
+           " (e.g. if Accounts is updated but this repo is not)" do
+          result = described_class.handle(
+            request: mock_omniauth_request(faculty_status: "howdy_ho")
+          )
+          expect(result.outputs.account).to be_no_faculty_info
+        end
+
+        it "defaults to no_faculty_info if faculty status is not present" do
+          request = mock_omniauth_request()
+          remove_faculty_status!(request)
+          result = described_class.handle(request: request)
+          expect(result.outputs.account).to be_no_faculty_info
+        end
+      end
+
       context "role" do
         it "sets the role on the account" do
           result = described_class.handle(
             request: mock_omniauth_request(self_reported_role: "instructor")
           )
-          expect(result.outputs.account.role).to eq "instructor"
+          expect(result.outputs.account).to be_instructor
         end
 
         it "deals with unknown role (e.g. if Accounts update but this repo not)" do
@@ -66,6 +66,22 @@ module OpenStax
         end
       end
 
+      context "school_type" do
+        it "sets the school_type on the account" do
+          result = described_class.handle(
+            request: mock_omniauth_request(school_type: "college")
+          )
+          expect(result.outputs.account).to be_college
+        end
+
+        it "deals with unknown school_type (e.g. if Accounts update but this repo not)" do
+          result = described_class.handle(
+            request: mock_omniauth_request(school_type: "howdy_ho")
+          )
+          expect(result.outputs.account).to be_unknown_school_type
+        end
+      end
+
       context "user exists" do
         it "updates the user's data" do
           existing_account = FactoryBot.create :openstax_accounts_account

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

@@ -49,7 +49,7 @@ module OpenStax
           email: 'bob@example.com', username: nil, password: nil,
           first_name: 'Bob', last_name: 'Smith', full_name: 'Bob Smith',
           salesforce_contact_id: 'b0b', faculty_status: :rejected_faculty,
-          role: :instructor
+          role: :instructor, school_type: :college
         ).and_return(find_or_create_account_response)
 
         described_class.call(
@@ -59,7 +59,8 @@ module OpenStax
           full_name: 'Bob Smith',
           salesforce_contact_id: 'b0b',
           faculty_status: :rejected_faculty,
-          role: :instructor
+          role: :instructor,
+          school_type: :college
         )
       end
 

data/spec/spec_helper.rb

@@ -52,14 +52,15 @@ end
 
 def mock_omniauth_request(
     uid: nil, first_name: nil, last_name: nil, title: nil, nickname: nil, faculty_status: nil,
-    uuid: nil, support_identifier: nil, self_reported_role: nil
+    uuid: nil, support_identifier: nil, self_reported_role: nil, school_type: nil
   )
   extra_hash = {
     'raw_info' => {
       'faculty_status' => faculty_status,
       'uuid' => uuid || SecureRandom.uuid,
       'support_identifier' => support_identifier || "cs_#{SecureRandom.hex(4)}",
-      'self_reported_role' => self_reported_role
+      'self_reported_role' => self_reported_role,
+      'school_type' => school_type
     }
   }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstax_accounts
 version: !ruby/object:Gem::Version
-  version: 7.12.0
+  version: 7.13.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2018-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -174,16 +174,16 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -371,6 +371,7 @@ files:
 - 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/13_add_school_type_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
@@ -495,7 +496,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Rails common code and bindings for the 'accounts' API