hyrax 1.0.5 → 1.1.0

data/spec/presenters/hyrax/admin/users_presenter_spec.rb

@@ -1,7 +1,7 @@
 describe Hyrax::Admin::UsersPresenter do
   let(:instance) { described_class.new }
-  let!(:user) { FactoryGirl.create(:user) }
-  let!(:admin_user) { FactoryGirl.create(:user, groups: 'admin') }
+  let!(:user) { FactoryBot.create(:user) }
+  let!(:admin_user) { FactoryBot.create(:user, groups: 'admin') }
   let!(:audit_user) { User.audit_user }
   let!(:batch_user) { User.batch_user }
 

data/spec/services/hyrax/embargo_service_spec.rb

@@ -6,19 +6,19 @@ describe Hyrax::EmbargoService do
   let(:past_date) { 2.days.ago }
 
   let!(:work_with_expired_embargo1) do
-    FactoryGirl.build(:generic_work, embargo_release_date: past_date.to_s).tap do |work|
+    FactoryBot.build(:generic_work, embargo_release_date: past_date.to_s).tap do |work|
       work.save(validate: false)
     end
   end
 
   let!(:work_with_expired_embargo2) do
-    FactoryGirl.build(:generic_work, embargo_release_date: past_date.to_s).tap do |work|
+    FactoryBot.build(:generic_work, embargo_release_date: past_date.to_s).tap do |work|
       work.save(validate: false)
     end
   end
 
-  let!(:work_with_embargo_in_effect) { FactoryGirl.create(:generic_work, embargo_release_date: future_date.to_s) }
-  let!(:work_without_embargo) { FactoryGirl.create(:generic_work) }
+  let!(:work_with_embargo_in_effect) { FactoryBot.create(:generic_work, embargo_release_date: future_date.to_s) }
+  let!(:work_without_embargo) { FactoryBot.create(:generic_work) }
 
   describe '#assets_with_expired_embargoes' do
     it 'returns an array of assets with expired embargoes' do

data/spec/services/hyrax/repository_audit_service_spec.rb

@@ -1,5 +1,5 @@
 describe Hyrax::RepositoryAuditService do
-  let(:user) { FactoryGirl.create(:user) }
+  let(:user) { FactoryBot.create(:user) }
   let!(:file) do
     FileSet.create! do |file|
       file.add_file(File.open(fixture_path + '/world.png'), path: 'content', original_name: 'world.png')

data/spec/services/hyrax/workflow/permission_generator_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module Hyrax
   module Workflow
     RSpec.describe PermissionGenerator do
-      let(:user) { FactoryGirl.create(:user) }
+      let(:user) { FactoryBot.create(:user) }
       let(:role) { Sipity::Role.create!(name: 'creating_user') }
       let(:workflow) { create(:workflow, name: 'workflow') }
       let(:workflow_state) { workflow.initial_workflow_state }

data/spec/spec_helper.rb

@@ -21,7 +21,7 @@ if coverage_needed?
   SimpleCov.command_name 'spec'
 end
 
-require 'factory_girl'
+require 'factory_bot'
 require 'engine_cart'
 EngineCart.load_application!
 
@@ -111,7 +111,7 @@ end
 
 class JsonStrategy
   def initialize
-    @strategy = FactoryGirl.strategy_by_name(:create).new
+    @strategy = FactoryBot.strategy_by_name(:create).new
   end
 
   delegate :association, to: :@strategy
@@ -121,9 +121,9 @@ class JsonStrategy
   end
 end
 
-FactoryGirl.register_strategy(:json, JsonStrategy)
-FactoryGirl.definition_file_paths = [File.expand_path("../factories", __FILE__)]
-FactoryGirl.find_definitions
+FactoryBot.register_strategy(:json, JsonStrategy)
+FactoryBot.definition_file_paths = [File.expand_path("../factories", __FILE__)]
+FactoryBot.find_definitions
 
 module EngineRoutes
   def self.included(base)
@@ -222,7 +222,7 @@ RSpec.configure do |config|
 
   config.include Capybara::RSpecMatchers, type: :input
   config.include InputSupport, type: :input
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
 
   config.infer_spec_type_from_file_location!
 

data/spec/support/features/session_helpers.rb

@@ -3,7 +3,7 @@ module Features
   module SessionHelpers
     def sign_in(who = :user)
       logout
-      user = who.is_a?(User) ? who : FactoryGirl.build(:user).tap(&:save!)
+      user = who.is_a?(User) ? who : FactoryBot.build(:user).tap(&:save!)
       visit new_user_session_path
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password

data/spec/views/hyrax/admin/users/index.html.erb_spec.rb

@@ -3,7 +3,7 @@ describe 'hyrax/admin/users/index.html.erb', type: :view do
   let(:users) { [] }
 
   before do
-    (1..4).each { |i| users << FactoryGirl.build(:user, display_name: "user#{i}", email: "email#{i}@example.com", last_sign_in_at: Time.zone.now - 15.minutes, created_at: Time.zone.now - 3.days) }
+    (1..4).each { |i| users << FactoryBot.build(:user, display_name: "user#{i}", email: "email#{i}@example.com", last_sign_in_at: Time.zone.now - 15.minutes, created_at: Time.zone.now - 3.days) }
     allow(presenter).to receive(:users).and_return(users)
     assign(:presenter, presenter)
   end

data/spec/views/hyrax/base/_items.html.erb_spec.rb

@@ -8,7 +8,7 @@ describe 'hyrax/base/items', type: :view do
   let(:solr_doc) { double(id: '123', human_readable_type: 'Work') }
   let(:solr_doc_file) do
     SolrDocument.new(
-      FactoryGirl.build(:file_set).to_solr.merge(
+      FactoryBot.build(:file_set).to_solr.merge(
         id: "file",
         title_tesim: ["Child File"],
         label_tesim: ["ChildFile.pdf"]
@@ -17,7 +17,7 @@ describe 'hyrax/base/items', type: :view do
   end
   let(:solr_doc_work) do
     SolrDocument.new(
-      FactoryGirl.build(:generic_work).to_solr.merge(
+      FactoryBot.build(:generic_work).to_solr.merge(
         id: "work",
         title_tesim: ["Child Work"]
       )

data/spec/views/hyrax/base/file_manager.html.erb_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe "hyrax/base/file_manager.html.erb" do
       )
     )
   end
-  let(:resource) { FactoryGirl.build(:file_set) }
+  let(:resource) { FactoryBot.build(:file_set) }
 
   let(:parent) { build(:generic_work) }
 

data/spec/views/hyrax/dashboard/index_spec.rb

@@ -105,7 +105,7 @@ RSpec.describe "hyrax/dashboard/index.html.erb", type: :view do
 
     context "with notifications" do
       before do
-        assign(:notifications, FactoryGirl.create(:user_with_mail).mailbox.inbox)
+        assign(:notifications, FactoryBot.create(:user_with_mail).mailbox.inbox)
       end
 
       it "shows a link to all notifications" do

data/template.rb

@@ -1,4 +1,4 @@
-gem 'hyrax', '1.0.5'
+gem 'hyrax', '1.1.0'
 
 run 'bundle install'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-10 00:00:00.000000000 Z
+date: 2018-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -833,7 +833,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -972,6 +972,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simple_form
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 3.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 3.5.0
 description: Hyrax is a featureful Samvera front-end based on the latest and greatest
   Samvera software components.
 email:
@@ -2173,6 +2193,7 @@ files:
 - spec/features/ownership_transfer_spec.rb
 - spec/features/proxy_spec.rb
 - spec/features/search_spec.rb
+- spec/features/show_admin_set_spec.rb
 - spec/features/static_pages_spec.rb
 - spec/features/user_admin_set_spec.rb
 - spec/features/users_spec.rb
@@ -2627,7 +2648,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Hyrax is a front-end based on the robust Samvera framework, providing a user
@@ -2762,6 +2783,7 @@ test_files:
 - spec/features/ownership_transfer_spec.rb
 - spec/features/proxy_spec.rb
 - spec/features/search_spec.rb
+- spec/features/show_admin_set_spec.rb
 - spec/features/static_pages_spec.rb
 - spec/features/user_admin_set_spec.rb
 - spec/features/users_spec.rb