hyrax 2.2.0 → 2.2.1

data/spec/factories/operations.rb

@@ -1,21 +1,21 @@
 FactoryBot.define do
   factory :operation, class: Hyrax::Operation do
-    operation_type "Test operation"
+    operation_type { "Test operation" }
 
     trait :failing do
-      status Hyrax::Operation::FAILURE
+      status { Hyrax::Operation::FAILURE }
     end
 
     trait :pending do
-      status Hyrax::Operation::PENDING
+      status { Hyrax::Operation::PENDING }
     end
 
     trait :successful do
-      status Hyrax::Operation::SUCCESS
+      status { Hyrax::Operation::SUCCESS }
     end
 
     factory :batch_create_operation, class: Hyrax::BatchCreateOperation do
-      operation_type "Batch Create"
+      operation_type { "Batch Create" }
     end
   end
 end

data/spec/factories/permission_template_accesses.rb

@@ -2,15 +2,15 @@ FactoryBot.define do
   factory :permission_template_access, class: Hyrax::PermissionTemplateAccess do
     permission_template
     trait :manage do
-      access 'manage'
+      access { 'manage' }
     end
 
     trait :deposit do
-      access 'deposit'
+      access { 'deposit' }
     end
 
     trait :view do
-      access 'view'
+      access { 'view' }
     end
   end
 end

data/spec/factories/permission_templates.rb

@@ -52,16 +52,16 @@ FactoryBot.define do
     end
 
     transient do
-      with_admin_set false
-      with_collection false
-      with_workflows false
-      with_active_workflow false
-      manage_users nil
-      manage_groups nil
-      deposit_users nil
-      deposit_groups nil
-      view_users nil
-      view_groups nil
+      with_admin_set { false }
+      with_collection { false }
+      with_workflows { false }
+      with_active_workflow { false }
+      manage_users { nil }
+      manage_groups { nil }
+      deposit_users { nil }
+      deposit_groups { nil }
+      view_users { nil }
+      view_groups { nil }
     end
   end
 

data/spec/factories/single_use_links.rb

@@ -1,13 +1,13 @@
 FactoryBot.define do
   factory :single_use_link do
     factory :show_link do
-      itemId 'fs-id'
-      path '/concerns/generic_work/1234'
+      itemId { 'fs-id' }
+      path { '/concerns/generic_work/1234' }
     end
 
     factory :download_link do
-      itemId 'fs-id'
-      path '/downloads/1234'
+      itemId { 'fs-id' }
+      path { '/downloads/1234' }
     end
   end
 end

data/spec/factories/sipity_entities.rb

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :sipity_entity, class: Sipity::Entity do
-    proxy_for_global_id 'gid://internal/Mock/1'
+    proxy_for_global_id { 'gid://internal/Mock/1' }
     workflow { workflow_state.workflow }
     workflow_state
   end

data/spec/factories/users.rb

@@ -1,12 +1,12 @@
 FactoryBot.define do
   factory :user do
     sequence(:email) { |n| "user#{n}@example.com" }
-    password 'password'
+    password { 'password' }
 
     transient do
       # Allow for custom groups when a user is instantiated.
       # @example create(:user, groups: 'avacado')
-      groups []
+      groups { [] }
     end
 
     # TODO: Register the groups for the given user key such that we can remove the following from other specs:
@@ -22,7 +22,7 @@ FactoryBot.define do
     end
 
     factory :admin do
-      groups ['admin']
+      groups { ['admin'] }
     end
 
     factory :user_with_mail do
@@ -46,7 +46,7 @@ FactoryBot.define do
   end
 
   trait :guest do
-    guest true
+    guest { true }
   end
 end
 

data/spec/factories/workflow_actions.rb

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :workflow_action, class: Sipity::WorkflowAction do
     workflow
-    name 'submit'
+    name { 'submit' }
   end
 end

data/spec/factories/workflow_states.rb

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :workflow_state, class: Sipity::WorkflowState do
     workflow
-    name 'initial'
+    name { 'initial' }
   end
 end

data/spec/features/batch_create_spec.rb

@@ -39,7 +39,7 @@ RSpec.describe 'Batch creation of works', type: :feature do
     it "allows on-behalf-of batch deposit", :js do
       click_link "Files" # switch tab
       expect(page).to have_content "Add files"
-      within('button#addfiles') do
+      within('span#addfiles') do
         # two arbitrary files that aren't actually related, but should be
         # small enough to require minimal processessing.
         attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/small_file.txt", visible: false)

data/spec/features/create_work_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe 'Creating a new Work', :js, :workflow do
       click_link "Files" # switch tab
       expect(page).to have_content "Add files"
       expect(page).to have_content "Add folder"
-      within('button#addfiles') do
+      within('span#addfiles') do
         attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/image.jp2", visible: false)
         attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/jp2_fits.xml", visible: false)
       end
@@ -71,7 +71,7 @@ RSpec.describe 'Creating a new Work', :js, :workflow do
     it "allows on-behalf-of deposit" do
       click_link "Files" # switch tab
       expect(page).to have_content "Add files"
-      within('button#addfiles') do
+      within('span#addfiles') do
         attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/image.jp2", visible: false)
         attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/jp2_fits.xml", visible: false)
       end
@@ -113,7 +113,7 @@ RSpec.describe 'Creating a new Work', :js, :workflow do
 
     it 'updates the required file check status' do
       click_link "Files" # switch to the Files tab
-      within('button#addfiles') do
+      within('span#addfiles') do
         attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/image.jp2", visible: false)
       end
       expect(page).to have_css('ul li#required-files.complete', text: 'Add files')

data/spec/features/dashboard/collection_spec.rb

@@ -671,7 +671,7 @@ RSpec.describe 'collection', type: :feature, clean_repo: true do
 
         # add required file
         click_link "Files" # switch tab
-        within('button#addfiles') do
+        within('span#addfiles') do
           attach_file("files[]", "#{Hyrax::Engine.root}/spec/fixtures/image.jp2", visible: false)
         end
         # set required metadata

data/spec/forms/hyrax/forms/work_form_spec.rb

@@ -106,7 +106,7 @@ RSpec.describe Hyrax::Forms::WorkForm do
         parent_id: '123',
         representative_id: '456',
         thumbnail_id: '789',
-        keyword: ['derp'],
+        keyword: ['penguin'],
         source: ['related'],
         rights_statement: 'http://rightsstatements.org/vocab/InC-EDU/1.0/',
         license: ['http://creativecommons.org/licenses/by/3.0/us/']
@@ -121,7 +121,7 @@ RSpec.describe Hyrax::Forms::WorkForm do
       expect(subject['visibility']).to eq 'open'
       expect(subject['license']).to eq ['http://creativecommons.org/licenses/by/3.0/us/']
       expect(subject['rights_statement']).to eq 'http://rightsstatements.org/vocab/InC-EDU/1.0/'
-      expect(subject['keyword']).to eq ['derp']
+      expect(subject['keyword']).to eq ['penguin']
       expect(subject['source']).to eq ['related']
     end
 

data/spec/forms/hyrax/generic_work_form_spec.rb

@@ -59,7 +59,7 @@ RSpec.describe Hyrax::GenericWorkForm do
         representative_id: '456',
         rendering_ids: [file_set.id],
         thumbnail_id: '789',
-        keyword: ['derp'],
+        keyword: ['penguin'],
         license: ['http://creativecommons.org/licenses/by/3.0/us/'],
         member_of_collection_ids: ['123456', 'abcdef']
       )
@@ -72,7 +72,7 @@ RSpec.describe Hyrax::GenericWorkForm do
       expect(subject['description']).to be_empty
       expect(subject['visibility']).to eq 'open'
       expect(subject['license']).to eq ['http://creativecommons.org/licenses/by/3.0/us/']
-      expect(subject['keyword']).to eq ['derp']
+      expect(subject['keyword']).to eq ['penguin']
       expect(subject['member_of_collection_ids']).to eq ['123456', 'abcdef']
       expect(subject['rendering_ids']).to eq [file_set.id]
     end

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

@@ -29,4 +29,20 @@ RSpec.describe Hyrax::Admin::UsersPresenter do
       end
     end
   end
+
+  describe 'show_last_access?' do
+    before do
+      allow(User).to receive(:devise_modules).and_return(modules)
+    end
+    subject { instance.show_last_access? }
+    context 'when devise trackable is installed' do
+      let(:modules) { [:trackable] }
+      it { is_expected.to be true }
+    end
+
+    context 'when devise trackable is not installed' do
+      let(:modules) { [:rememberable] }
+      it { is_expected.to be false }
+    end
+  end
 end

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

@@ -3,19 +3,43 @@ RSpec.describe 'hyrax/admin/users/index.html.erb', type: :view do
   let(:users) { [] }
 
   before do
-    (1..4).each { |i| users << 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 << build(:user, display_name: "user#{i}", email: "email#{i}@example.com", created_at: Time.zone.now - 3.days) }
     allow(presenter).to receive(:users).and_return(users)
     assign(:presenter, presenter)
+    allow(presenter).to receive(:show_last_access?).and_return(show_last_access)
   end
 
-  it "draws user list with all users" do
+  let(:page) do
     render
-    page = Capybara::Node::Simple.new(rendered)
-    expect(page).to have_content("Username")
-    expect(page).to have_content("Roles")
-    expect(page).to have_content("Last access")
-    (1..4).each do |i|
-      expect(page).to have_content("email#{i}@example.com")
+    Capybara::Node::Simple.new(rendered)
+  end
+
+  context 'when show_last_access? is true' do
+    let(:show_last_access) { true }
+    before do
+      allow(presenter).to receive(:last_accessed).and_return(Time.zone.now - 3.days)
+    end
+
+    it 'draws user list with all users' do
+      expect(page).to have_content("Username")
+      expect(page).to have_content("Roles")
+      expect(page).to have_content("Last access")
+      (1..4).each do |i|
+        expect(page).to have_content("email#{i}@example.com")
+      end
+    end
+  end
+
+  context 'when show_last_access? is false' do
+    let(:show_last_access) { false }
+
+    it 'draws user list with all users' do
+      expect(page).to have_content("Username")
+      expect(page).to have_content("Roles")
+      expect(page).not_to have_content("Last access")
+      (1..4).each do |i|
+        expect(page).to have_content("email#{i}@example.com")
+      end
     end
   end
 end

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

@@ -21,6 +21,6 @@ RSpec.describe 'hyrax/base/edit.html.erb', type: :view do
     expect(view).to receive(:provide).with(:page_title, 'A nice work // Generic Work [456] // Hyrax')
     expect(view).to receive(:provide).with(:page_header).and_yield
     render
-    expect(rendered).to eq "  <h1><span class=\"fa fa-edit\"></span>Edit Work</h1>\n\na form\n"
+    expect(rendered).to eq "  <h1><span class=\"fa fa-edit\" aria-hidden=\"true\"></span>Edit Work</h1>\n\na form\n"
   end
 end

data/template.rb

@@ -1,4 +1,4 @@
-gem 'hyrax', '2.2.0'
+gem 'hyrax', '2.2.1'
 run 'bundle install'
 generate 'hyrax:install', '-f'
 rails_command 'db:migrate'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2018-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -3005,7 +3005,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+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