openstax_salesforce 2.0.0 → 2.0.1

data/spec/factories/user.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user, class: 'OpenStax::Salesforce::User' do
     uid           { SecureRandom.hex(10) }
     name          { Faker::Name.name }
@@ -7,7 +7,7 @@ FactoryGirl.define do
     instance_url  { Faker::Internet.url }
 
     transient do
-      do_not_destroy_others false
+      do_not_destroy_others { false }
     end
 
     after(:build) do |user, evaluator|

data/spec/openstax/salesforce/controllers/application_controller_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe OpenStax::Salesforce::ApplicationController, type: :controller do
 
   controller do
     def index
-      render :text => "Yo"
+      render plain: "Yo"
     end
   end
 
@@ -16,7 +16,7 @@ RSpec.describe OpenStax::Salesforce::ApplicationController, type: :controller do
   it 'can have its admin check overridden' do
     mock_admin_user
     get :index
-    expect(response).to have_http_status(:success)
+    expect(response).to have_http_status(:ok)
   end
 
 end

data/spec/openstax/salesforce/controllers/settings_controller_spec.rb

@@ -18,8 +18,8 @@ RSpec.describe OpenStax::Salesforce::SettingsController, type: :controller do
 
       context 'when there are other SF users' do
         it 'adds a user and removes existing users' do
-          other_user_1 = FactoryGirl.create(:user, do_not_destroy_others: true)
-          other_user_2 = FactoryGirl.create(:user, do_not_destroy_others: true)
+          other_user_1 = FactoryBot.create(:user, do_not_destroy_others: true)
+          other_user_2 = FactoryBot.create(:user, do_not_destroy_others: true)
 
           allow_any_instance_of(described_class)
             .to receive(:env)
@@ -33,7 +33,7 @@ RSpec.describe OpenStax::Salesforce::SettingsController, type: :controller do
 
       context 'when a user with the same uid already exists' do
         it 'reuses that user' do
-          a_user_1 = FactoryGirl.create(:user, uid: 'someuid')
+          a_user_1 = FactoryBot.create(:user, uid: 'someuid')
 
           allow_any_instance_of(described_class)
             .to receive(:env)
@@ -52,7 +52,7 @@ RSpec.describe OpenStax::Salesforce::SettingsController, type: :controller do
       routes { OpenStax::Salesforce::Engine.routes }
 
       it 'destroys users' do
-        FactoryGirl.create(:user)
+        FactoryBot.create(:user)
         expect{delete :destroy_user}.to change {OpenStax::Salesforce::User.count}.by(-1)
       end
     end

data/spec/openstax/salesforce/remote/opportunity_spec.rb

@@ -2,8 +2,9 @@ require 'rails_helper'
 
 RSpec.describe OpenStax::Salesforce::Remote::Opportunity do
 
+  subject(:opportunity) { described_class.new(term_year: '2016 - 17 Fall') }
+
   it 'returns a TermYear object' do
-    opportunity = described_class.new(term_year: '2016 - 17 Fall')
     expect(opportunity.term_year_object).to be_a OpenStax::Salesforce::Remote::TermYear
   end
 

data/spec/rails_helper.rb

@@ -3,9 +3,8 @@ ENV["RAILS_ENV"] ||= 'test'
 require 'spec_helper'
 require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'
-require 'factory_girl_rails'
+require 'factory_bot_rails'
 require 'faker'
-require 'squeel'
 require 'byebug'
 require 'database_cleaner'
 

metadata

@@ -1,41 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: openstax_salesforce
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-14 00:00:00.000000000 Z
+date: 2018-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: restforce
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.3
 - !ruby/object:Gem::Dependency
@@ -56,14 +62,14 @@ dependencies:
   name: omniauth-salesforce
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.5
 - !ruby/object:Gem::Dependency
@@ -95,7 +101,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -122,20 +128,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: squeel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement