hyrax 2.0.0.beta1 → 2.0.0.beta2

data/spec/channels/hyrax/application_cable/connection_spec.rb

@@ -0,0 +1,31 @@
+RSpec.describe Hyrax::ApplicationCable::Connection, no_clean: true do
+  subject { described_class.new(server, env) }
+
+  let(:server) { ActionCable::Server::Base.new }
+  let(:env) { {} }
+
+  describe '#connect' do
+    # rubocop:disable RSpec/SubjectStub
+    before do
+      allow(subject).to receive(:user_id).and_return(user_id)
+    end
+    # rubocop:enable RSpec/SubjectStub
+
+    context 'when user is found' do
+      let(:user) { create(:user) }
+      let(:user_id) { user.id }
+
+      it 'sets #current_user to the found user instance' do
+        expect { subject.connect }.to change { subject.current_user }.from(nil).to(user)
+      end
+    end
+
+    context 'when user is not found' do
+      let(:user_id) { nil }
+
+      it 'rejects the unauthorized connection' do
+        expect { subject.connect }.to raise_error(ActionCable::Connection::Authorization::UnauthorizedError)
+      end
+    end
+  end
+end

data/spec/channels/hyrax/notifications_channel_spec.rb

@@ -0,0 +1,45 @@
+RSpec.describe Hyrax::NotificationsChannel, no_clean: true do
+  subject { described_class.new(connection, nil) }
+
+  let(:connection) { Hyrax::ApplicationCable::Connection.new(server, {}) }
+  let(:server) { ActionCable::Server::Base.new }
+  let(:user) { create(:user) }
+
+  before do
+    allow(connection).to receive(:find_verified_user).and_return(user)
+    connection.connect
+  end
+
+  describe '#current_user' do
+    it 'has a current user instance from its connection' do
+      expect(subject.current_user).to eq user
+    end
+  end
+
+  describe '#update_locale' do
+    let(:data) { { 'locale' => 'zh' } }
+
+    it 'updates the current user instance with the locale' do
+      expect { subject.update_locale(data) }.to change { user.preferred_locale }
+        .from(nil).to(data['locale'])
+    end
+  end
+
+  describe '#subscribed' do
+    # rubocop:disable RSpec/SubjectStub
+    it 'calls #stream_for with the current user instance' do
+      expect(subject).to receive(:stream_for).with(user).once
+      subject.subscribed
+    end
+    # rubocop:enable RSpec/SubjectStub
+  end
+
+  describe '#unsubscribed' do
+    # rubocop:disable RSpec/SubjectStub
+    it 'calls #stop_all_streams' do
+      expect(subject).to receive(:stop_all_streams).once
+      subject.unsubscribed
+    end
+    # rubocop:enable RSpec/SubjectStub
+  end
+end

data/spec/controllers/hyrax/notifications_controller_spec.rb

@@ -9,6 +9,7 @@ RSpec.describe Hyrax::NotificationsController, type: :controller do
   describe "#index" do
     it "shows message" do
       expect(mock_box).to receive(:inbox).and_return(["test"])
+      expect(StreamNotificationsJob).to receive(:perform_later).once
       get :index
       expect(response).to be_success
       expect(assigns[:messages]).to eq(["test"])

data/spec/helpers/blacklight_helper_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 RSpec.describe BlacklightHelper, type: :helper do
   let(:blacklight_config) { CatalogController.blacklight_config }
   let(:attributes) do
@@ -49,8 +51,8 @@ RSpec.describe BlacklightHelper, type: :helper do
       let(:field_name) { 'rights_tesim' }
 
       it do
-        is_expected.to eq "<a href=\"http://creativecommons.org/publicdomain/zero/1.0/\">CC0 1.0 Universal</a>, " \
-                             "<a href=\"http://creativecommons.org/publicdomain/mark/1.0/\">Public Domain Mark 1.0</a>, " \
+        is_expected.to eq "<a href=\"http://creativecommons.org/publicdomain/zero/1.0/\">Creative Commons CC0 1.0 Universal</a>, " \
+                             "<a href=\"http://creativecommons.org/publicdomain/mark/1.0/\">Creative Commons Public Domain Mark 1.0</a>, " \
                              "and <a href=\"http://www.europeana.eu/portal/rights/rr-r.html\">All rights reserved</a>"
       end
     end

data/spec/helpers/hyrax_helper_spec.rb

@@ -23,6 +23,36 @@ RSpec.describe HyraxHelper, type: :helper do
     end
   end
 
+  describe '#render_notifications' do
+    let(:mailbox) { double('mailbox', unread_count: unread_count, label: 'Foobar') }
+
+    subject { helper.render_notifications(user: nil) }
+
+    before do
+      allow(UserMailbox).to receive(:new).and_return(mailbox)
+    end
+
+    context 'with unread messages' do
+      let(:unread_count) { 10 }
+
+      it 'renders with label-danger and is visible' do
+        expect(subject).to eq '<a aria-label="Foobar" class="notify-number" href="/notifications"><span class="fa fa-bell"></span>' \
+                              "\n" \
+                              '<span class="count label label-danger">10</span></a>'
+      end
+    end
+
+    context 'with no unread messages' do
+      let(:unread_count) { 0 }
+
+      it 'renders with label-default and is invisible' do
+        expect(subject).to eq '<a aria-label="Foobar" class="notify-number" href="/notifications"><span class="fa fa-bell"></span>' \
+                              "\n" \
+                              '<span class="count label invisible label-default">0</span></a>'
+      end
+    end
+  end
+
   describe '#available_translations' do
     subject { helper.available_translations }
 
@@ -321,16 +351,16 @@ RSpec.describe HyraxHelper, type: :helper do
     it "maps the url to a link with a label" do
       expect(helper.license_links(
                value: ["http://creativecommons.org/publicdomain/zero/1.0/"]
-      )).to eq("<a href=\"http://creativecommons.org/publicdomain/zero/1.0/\">CC0 1.0 Universal</a>")
+      )).to eq("<a href=\"http://creativecommons.org/publicdomain/zero/1.0/\">Creative Commons CC0 1.0 Universal</a>")
     end
 
-    it "converts multiple rights statements to a sentence" do
+    it "converts multiple licenses to a sentence" do
       expect(helper.license_links(
                value: ["http://creativecommons.org/publicdomain/zero/1.0/",
                        "http://creativecommons.org/publicdomain/mark/1.0/",
                        "http://www.europeana.eu/portal/rights/rr-r.html"]
-      )).to eq("<a href=\"http://creativecommons.org/publicdomain/zero/1.0/\">CC0 1.0 Universal</a>, " \
-               "<a href=\"http://creativecommons.org/publicdomain/mark/1.0/\">Public Domain Mark 1.0</a>, " \
+      )).to eq("<a href=\"http://creativecommons.org/publicdomain/zero/1.0/\">Creative Commons CC0 1.0 Universal</a>, " \
+               "<a href=\"http://creativecommons.org/publicdomain/mark/1.0/\">Creative Commons Public Domain Mark 1.0</a>, " \
                "and <a href=\"http://www.europeana.eu/portal/rights/rr-r.html\">All rights reserved</a>")
     end
   end

data/spec/jobs/import_url_job_spec.rb

@@ -29,7 +29,7 @@ RSpec.describe ImportUrlJob do
     end
 
     it 'creates the content and updates the associated operation' do
-      expect(actor).to receive(:create_content).with(File).and_return(true)
+      expect(actor).to receive(:create_content).with(File, from_url: true).and_return(true)
       described_class.perform_now(file_set, operation)
       expect(operation).to be_success
     end

data/spec/jobs/stream_notifications_job_spec.rb

@@ -0,0 +1,30 @@
+RSpec.describe StreamNotificationsJob do
+  describe '#perform' do
+    context 'with zero users' do
+      let(:users) { nil }
+
+      it 'does not broadcast' do
+        expect(Hyrax::NotificationsChannel).not_to receive(:broadcast_to)
+        described_class.perform_now(users)
+      end
+    end
+
+    context 'with a user' do
+      let(:users) { create(:user) }
+      let(:mailbox) { double('mailbox', unread_count: 7, label: "You've got mail!") }
+
+      before do
+        allow(UserMailbox).to receive(:new).and_return(mailbox)
+      end
+
+      it 'broadcasts to the user' do
+        expect(Hyrax::NotificationsChannel).to receive(:broadcast_to)
+          .once
+          .with(users,
+                notifications_count: 7,
+                notifications_label: "You've got mail!")
+        described_class.perform_now(users)
+      end
+    end
+  end
+end

data/spec/models/collection_spec.rb

@@ -14,18 +14,15 @@ RSpec.describe Collection do
   end
 
   describe "#to_solr" do
-    let(:user) { create(:user) }
+    let(:user) { build(:user) }
     let(:collection) { build(:collection, user: user, title: ['A good title']) }
 
     let(:solr_document) { collection.to_solr }
 
-    it "has title information" do
+    it "has title information and depositor information" do
       expect(solr_document).to include 'title_tesim' => ['A good title'],
-                                       'title_sim' => ['A good title']
-    end
-
-    it "has depositor information" do
-      expect(solr_document).to include 'depositor_tesim' => [user.user_key],
+                                       'title_sim' => ['A good title'],
+                                       'depositor_tesim' => [user.user_key],
                                        'depositor_ssim' => [user.user_key]
     end
   end
@@ -42,7 +39,7 @@ RSpec.describe Collection do
     end
   end
 
-  describe "#members_objects" do
+  describe "#members_objects", clean_repo: true do
     let(:collection) { create(:collection) }
 
     it "is empty by default" do
@@ -52,43 +49,40 @@ RSpec.describe Collection do
     context "adding members" do
       let(:work1) { create(:work) }
       let(:work2) { create(:work) }
-      let(:work3) { create(:work) }
 
       it "allows multiple files to be added" do
-        collection.add_member_objects [work1.id, work2.id, work3.id]
+        collection.add_member_objects [work1.id, work2.id]
         collection.save!
-        expect(collection.reload.member_objects).to match_array [work1, work2, work3]
+        expect(collection.reload.member_objects).to match_array [work1, work2]
       end
     end
   end
 
-  it "has a title" do
+  it "has a title", clean_repo: true do
     subject.title = ["title"]
     subject.save!
     expect(subject.reload.title).to eq ["title"]
   end
 
-  it "has a description" do
-    subject.title = ["title"]
+  it "has a description", clean_repo: true do
+    subject.title = ["title"] # Because the title is required
     subject.description = ["description"]
     subject.save!
     expect(subject.reload.description).to eq ["description"]
   end
 
-  describe "#destroy" do
+  describe "#destroy", clean_repo: true do
     let(:collection) { build(:collection) }
     let(:work1) { create(:work) }
-    let(:work2) { create(:work) }
 
     before do
-      collection.add_member_objects [work1.id, work2.id]
+      collection.add_member_objects [work1.id]
       collection.save!
       collection.destroy
     end
 
     it "does not delete member files when deleted" do
       expect(GenericWork.exists?(work1.id)).to be true
-      expect(GenericWork.exists?(work2.id)).to be true
     end
   end
 
@@ -111,7 +105,7 @@ RSpec.describe Collection do
     let(:member) { Member.create }
     let(:collection) { OtherCollection.create(title: ['test title']) }
 
-    it "have members that know about the collection" do
+    it "have members that know about the collection", clean_repo: true do
       member.reload
       expect(member.member_of_collections).to eq [collection]
     end

data/spec/models/proxy_deposit_request_spec.rb

@@ -112,7 +112,8 @@ RSpec.describe ProxyDepositRequest, type: :model do
     context 'when the transfer_to user is found' do
       it 'creates a transfer_request' do
         subject.transfer_to = receiver.user_key
-        subject.save!
+        expect { subject.save! }.to change { receiver.mailbox.inbox(unread: true).count }
+          .from(0).to(1)
         proxy_request = receiver.proxy_deposit_requests.first
         expect(proxy_request.work_id).to eq(work_id)
         expect(proxy_request.sending_user).to eq(sender)

data/spec/models/user_mailbox_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 RSpec.describe UserMailbox do
   let(:user)         { create(:user) }
   let(:another_user) { create(:user) }
@@ -19,6 +21,77 @@ RSpec.describe UserMailbox do
     end
   end
 
+  describe '#unread_count' do
+    it 'returns the number of unread messages for a user' do
+      expect { another_user.send_message(user, 'Another Test', '[subj]') }
+        .to change { subject.unread_count }.from(1).to(2)
+    end
+  end
+
+  describe '#label' do
+    # rubocop:disable RSpec/SubjectStub
+    before do
+      allow(subject).to receive(:unread_count).and_return(count)
+    end
+    # rubocop:enable RSpec/SubjectStub
+
+    context 'with zero unread messages' do
+      let(:count) { 0 }
+
+      it 'returns the appropriate label' do
+        expect(subject.label).to eq 'You have no unread notifications'
+      end
+    end
+
+    context 'with one unread message' do
+      let(:count) { 1 }
+
+      it 'returns the appropriate label' do
+        expect(subject.label).to eq 'You have one unread notification'
+      end
+    end
+
+    context 'with multiple unread messages' do
+      let(:count) { 5 }
+
+      it 'returns the appropriate label' do
+        expect(subject.label).to eq 'You have 5 unread notifications'
+      end
+    end
+
+    describe 'locales' do
+      let(:count) { 3 }
+
+      context 'when param is passed' do
+        it 'returns the label in the specified locale' do
+          expect(subject.label('es')).to eq 'Tienes notificaciones no leídas de 3'
+        end
+      end
+
+      context 'when param is not passed' do
+        before { allow(user).to receive(:preferred_locale).and_return(preferred_locale) }
+
+        context 'when user has a preferred locale' do
+          let(:preferred_locale) { 'it' }
+
+          it 'returns the label in the user-preferred locale' do
+            expect(I18n).not_to receive(:default_locale)
+            expect(subject.label).to eq 'Hai notifiche non letti 3'
+          end
+        end
+
+        context 'when user lacks a preferred locale' do
+          let(:preferred_locale) { nil }
+
+          it 'returns the system default locale' do
+            expect(I18n).to receive(:default_locale).once.and_return('de')
+            expect(subject.label).to eq 'Sie haben 3 ungelesene Benachrichtigungen'
+          end
+        end
+      end
+    end
+  end
+
   describe "#delete_all" do
     before do
       another_user.send_message(user, 'message 2', 'subject 2')

data/spec/services/hyrax/abstract_message_service_spec.rb

@@ -0,0 +1,25 @@
+RSpec.describe Hyrax::AbstractMessageService do
+  let(:file_set) { double }
+  let(:user) { build(:user) }
+  let(:klass) do
+    Class.new(described_class) do
+      def message
+        'You have won!'
+      end
+
+      def subject
+        'Attention!'
+      end
+    end
+  end
+
+  subject { klass.new(file_set, user) }
+
+  describe '#call' do
+    it 'invokes Hyrax::MessengerService to deliver the message' do
+      expect(Hyrax::MessengerService).to receive(:deliver)
+        .with(::User.audit_user, user, 'You have won!', 'Attention!').once
+      subject.call
+    end
+  end
+end

data/spec/services/hyrax/messenger_service_spec.rb

@@ -0,0 +1,15 @@
+RSpec.describe Hyrax::MessengerService do
+  describe '#deliver' do
+    let(:sender) { create(:user) }
+    let(:recipients) { create(:user) }
+    let(:body) { 'Quite an excellent message' }
+    let(:subject) { 'IMPORTANT' }
+    let(:other_arg) { 'Did I make it?' }
+
+    it 'invokes Hyrax::MessengerService to deliver the message' do
+      expect(sender).to receive(:send_message).with(recipients, body, subject, other_arg)
+      expect(StreamNotificationsJob).to receive(:perform_later).with(recipients)
+      described_class.deliver(sender, recipients, body, subject, other_arg)
+    end
+  end
+end

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -76,4 +76,10 @@ class TestAppGenerator < Rails::Generators::Base
     end
     copy_file 'disable_animations_in_test_environment.rb', 'app/middleware/disable_animations_in_test_environment.rb'
   end
+
+  def configure_action_cable_to_use_redis
+    gsub_file 'config/cable.yml',
+              "development:\n  adapter: async",
+              "development:\n  adapter: redis\n  url: redis://localhost:6379"
+  end
 end