sufia 6.2.0 → 6.3.0

data/spec/controllers/homepage_controller_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
-describe HomepageController, :type => :controller do
+describe HomepageController, type: :controller do
   routes { Rails.application.class.routes }
 
   describe "#index" do
     before do
-      @gf1 = GenericFile.new(title:['Test Document PDF'], filename:['test.pdf'], tag:['rocks'], read_groups:['public'])
+      @gf1 = GenericFile.new(title: ['Test Document PDF'], filename: ['test.pdf'], tag: ['rocks'], read_groups: ['public'])
       @gf1.apply_depositor_metadata('mjg36')
       @gf1.save
-      @gf2 = GenericFile.new(title:['Test Private Document'], filename:['test2.doc'], tag:['clouds'], contributor:['Contrib1'], read_groups:['private'])
+      @gf2 = GenericFile.new(title: ['Test Private Document'], filename: ['test2.doc'], tag: ['clouds'], contributor: ['Contrib1'], read_groups: ['private'])
       @gf2.apply_depositor_metadata('mjg36')
       @gf2.save
     end
@@ -30,7 +30,7 @@ describe HomepageController, :type => :controller do
     end
 
     context 'with no featured researcher' do
-      it "should set featured researcher" do
+      it "sets featured researcher" do
         get :index
         expect(response).to be_success
         assigns(:featured_researcher).tap do |researcher|
@@ -40,7 +40,7 @@ describe HomepageController, :type => :controller do
       end
     end
 
-    it "should set marketing text" do
+    it "sets marketing text" do
       get :index
       expect(response).to be_success
       assigns(:marketing_text).tap do |marketing|
@@ -49,23 +49,23 @@ describe HomepageController, :type => :controller do
       end
     end
 
-    it "should not include other user's private documents in recent documents" do
+    it "does not include other user's private documents in recent documents" do
       get :index
       expect(response).to be_success
-      titles = assigns(:recent_documents).map {|d| d['title_tesim'][0]}
+      titles = assigns(:recent_documents).map { |d| d['title_tesim'][0] }
       expect(titles).to_not include('Test Private Document')
     end
 
-    it "should include only GenericFile objects in recent documents" do
+    it "includes only GenericFile objects in recent documents" do
       get :index
       assigns(:recent_documents).each do |doc|
         expect(doc[Solrizer.solr_name("has_model", :symbol)]).to eql ["GenericFile"]
       end
-    end 
+    end
 
     context "with a document not created this second" do
       before do
-        gf3 = GenericFile.new(title:['Test 3 Document'], read_groups:['public'])
+        gf3 = GenericFile.new(title: ['Test 3 Document'], read_groups: ['public'])
         gf3.apply_depositor_metadata('mjg36')
         # stubbing to_solr so we know we have something that didn't create in the current second
         old_to_solr = gf3.method(:to_solr)
@@ -77,15 +77,13 @@ describe HomepageController, :type => :controller do
         gf3.save
       end
 
-      it "should set recent documents in the right order" do
+      it "sets recent documents in the right order" do
         get :index
         expect(response).to be_success
         expect(assigns(:recent_documents).length).to be <= 4
-        create_times = assigns(:recent_documents).map{|d| d['system_create_dtsi']}
+        create_times = assigns(:recent_documents).map { |d| d['system_create_dtsi'] }
         expect(create_times).to eq create_times.sort.reverse
       end
-
-
     end
 
     context "with featured works" do
@@ -93,11 +91,20 @@ describe HomepageController, :type => :controller do
         FeaturedWork.create!(generic_file_id: @gf1.id)
       end
 
-      it "should set featured works" do
+      it "sets featured works" do
         get :index
         expect(response).to be_success
         expect(assigns(:featured_work_list)).to be_kind_of FeaturedWorkList
       end
     end
+
+    it "sets announcement content block" do
+      get :index
+      expect(response).to be_success
+      assigns(:announcement_text).tap do |announcement|
+        expect(announcement).to be_kind_of ContentBlock
+        expect(announcement.name).to eq 'announcement_text'
+      end
+    end
   end
 end

data/spec/controllers/mailbox_controller_spec.rb

@@ -1,50 +1,34 @@
 require 'spec_helper'
 
-describe MailboxController, :type => :controller do
-  before(:each) do
-    @user = FactoryGirl.find_or_create(:jill)
-    @another_user = FactoryGirl.find_or_create(:archivist)
-    @message = "Test Message"
-    @subject = "Test Subject"
-    @rec1 = @another_user.send_message(@user, @message, @subject)
-    @rec2 = @user.send_message(@another_user, @message, @subject)
-    allow_any_instance_of(MailboxController).to receive(:authenticate_user!).and_return(true)
-    sign_in @user
+describe MailboxController, type: :controller do
+  let(:mock_box) { {} }
+
+  before do
+    allow_any_instance_of(described_class).to receive(:authenticate_user!).and_return(true)
+    allow(UserMailbox).to receive(:new).and_return(mock_box)
   end
 
   describe "#index" do
-    it "should show message" do
+    it "shows message" do
+      expect(mock_box).to receive(:inbox).and_return(["test"])
       get :index
       expect(response).to be_success
-      expect(assigns[:messages].first.last_message.body).to eq('Test Message')
-      expect(assigns[:messages].first.last_message.subject).to eq('Test Subject')
-      expect(@user.mailbox.inbox(unread: true).count).to eq(0)
-    end
-  end
-  describe "#delete" do
-    it "should delete message" do
-      rec = @another_user.send_message(@user, 'message 2', 'subject 2')
-      expect {
-        delete :destroy, id: rec.conversation.id
-        expect(response).to redirect_to(@routes.url_helpers.notifications_path)
-      }.to change {@user.mailbox.inbox.count}.by(-1)
-    end
-    it "should not delete message" do
-      @curator = FactoryGirl.find_or_create(:curator)
-      rec = @another_user.send_message(@curator, 'message 3', 'subject 3')
-      expect {
-        delete :destroy, id: rec.conversation.id
-        expect(response).to redirect_to(@routes.url_helpers.notifications_path)
-      }.to_not change { @curator.mailbox.inbox.count}
+      expect(assigns[:messages]).to eq(["test"])
     end
   end
+
   describe "#delete_all" do
-    it "should delete message" do
-      @another_user.send_message(@user, 'message 2', 'subject 2')
-      @another_user.send_message(@user, 'message 3', 'subject 3')
-      expect(@user.mailbox.inbox.count).to eq(3)
+    it "deletes all messages" do
+      expect(mock_box).to receive(:delete_all)
       get :delete_all
-      expect(@user.mailbox.inbox.count).to eq(0)
+    end
+  end
+
+  describe "#delete" do
+    it "deletes message" do
+      expect(mock_box).to receive(:destroy).with("4")
+      delete :destroy, id: "4"
+      expect(response).to redirect_to(@routes.url_helpers.notifications_path)
     end
   end
 end

data/spec/controllers/my/collections_controller_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe My::CollectionsController, :type => :controller do
+describe My::CollectionsController, type: :controller do
   describe "logged in user" do
-    before (:each) do
+    before do
       @user = FactoryGirl.find_or_create(:archivist)
       sign_in @user
     end
@@ -21,12 +21,12 @@ describe My::CollectionsController, :type => :controller do
         end
       end
 
-      it "should respond with success" do
+      it "responds with success" do
         get :index
         expect(response).to be_successful
       end
 
-      it "should paginate" do          
+      it "paginates" do
         Collection.new(title: "test collection").tap do |c|
           c.apply_depositor_metadata(@user.user_key)
           c.save!
@@ -52,5 +52,4 @@ describe My::CollectionsController, :type => :controller do
       end
     end
   end
-
 end

data/spec/controllers/my/files_controller_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
-describe My::FilesController, :type => :controller do
-
+describe My::FilesController, type: :controller do
   let(:my_collection) do
     Collection.create(title: 'test collection') do |c|
       c.apply_depositor_metadata(user.user_key)
@@ -36,12 +35,12 @@ describe My::FilesController, :type => :controller do
     @wrong_type = Batch.create
   end
 
-  it "should respond with success" do
+  it "responds with success" do
     get :index
     expect(response).to be_successful
   end
 
-  it "should paginate" do
+  it "paginates" do
     FactoryGirl.create(:generic_file)
     FactoryGirl.create(:generic_file)
     get :index, per_page: 2
@@ -72,20 +71,20 @@ describe My::FilesController, :type => :controller do
 
   describe "batch processing" do
     include Sufia::Messages
-    let(:batch_id) {"batch_id"}
-    let(:batch_id2) {"batch_id2"}
-    let(:batch) {double}
+    let(:batch_id) { "batch_id" }
+    let(:batch_id2) { "batch_id2" }
+    let(:batch) { double }
 
     before do
       allow(batch).to receive(:id).and_return(batch_id)
-      User.batchuser().send_message(user, single_success(batch_id, batch), success_subject, false)
-      User.batchuser().send_message(user, multiple_success(batch_id2, [batch]), success_subject, false)
+      User.batchuser.send_message(user, single_success(batch_id, batch), success_subject, false)
+      User.batchuser.send_message(user, multiple_success(batch_id2, [batch]), success_subject, false)
       get :index
     end
     it "gets batches that are complete" do
       expect(assigns(:batches).count).to eq(2)
-      expect(assigns(:batches)).to include("ss-"+batch_id)
-      expect(assigns(:batches)).to include("ss-"+batch_id2)
+      expect(assigns(:batches)).to include("ss-" + batch_id)
+      expect(assigns(:batches)).to include("ss-" + batch_id2)
     end
   end
 end

data/spec/controllers/my/highlights_controller_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe My::HighlightsController, :type => :controller do
+describe My::HighlightsController, type: :controller do
   describe "logged in user" do
-    before (:each) do
+    before do
       @user = FactoryGirl.find_or_create(:archivist)
       sign_in @user
     end
@@ -23,12 +23,12 @@ describe My::HighlightsController, :type => :controller do
         other_user.trophies.create(generic_file_id: @unrelated_highlighted_file.id)
       end
 
-      it "should respond with success" do
+      it "responds with success" do
         get :index
         expect(response).to be_successful
       end
 
-      it "should paginate" do          
+      it "paginates" do
         @user.trophies.create(generic_file_id: FactoryGirl.create(:generic_file, depositor: @user).id)
         @user.trophies.create(generic_file_id: FactoryGirl.create(:generic_file, depositor: @user).id)
         get :index, per_page: 2
@@ -48,5 +48,4 @@ describe My::HighlightsController, :type => :controller do
       end
     end
   end
-
 end

data/spec/controllers/my/shares_controller_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe My::SharesController, :type => :controller do
+describe My::SharesController, type: :controller do
   describe "logged in user" do
     let(:user) { FactoryGirl.find_or_create(:archivist) }
 
-    before (:each) do
+    before do
       sign_in user
     end
 
@@ -14,43 +14,42 @@ describe My::SharesController, :type => :controller do
       let!(:my_file) { FactoryGirl.create(:generic_file, depositor: user) }
       let!(:unshared_file) { FactoryGirl.create(:generic_file, depositor: other_user) }
 
-      let!(:shared_with_me) {
+      let!(:shared_with_me) do
         FactoryGirl.create(:generic_file).tap do |r|
           r.apply_depositor_metadata other_user
           r.edit_users += [user.user_key]
           r.save!
         end
-      }
+      end
 
-      let!(:read_shared_with_me) {
+      let!(:read_shared_with_me) do
         FactoryGirl.create(:generic_file, depositor: other_user).tap do |r|
           r.read_users += [user.user_key]
           r.save!
         end
-      }
+      end
 
-      let!(:shared_with_someone_else) {
+      let!(:shared_with_someone_else) do
         FactoryGirl.create(:generic_file).tap do |r|
           r.apply_depositor_metadata user
           r.edit_users += [other_user.user_key]
           r.save!
         end
-      }
+      end
 
-      let!(:my_collection) {
+      let!(:my_collection) do
         Collection.new(title: "My collection").tap do |c|
           c.apply_depositor_metadata(user.user_key)
           c.save!
         end
-      }
-
+      end
 
-      it "should respond with success" do
+      it "responds with success" do
         get :index
         expect(response).to be_successful
       end
 
-      it "should paginate" do          
+      it "paginates" do
         FactoryGirl.create(:generic_file).tap do |r|
           r.apply_depositor_metadata other_user
           r.edit_users += [user.user_key]
@@ -83,5 +82,4 @@ describe My::SharesController, :type => :controller do
       end
     end
   end
-
 end

data/spec/controllers/my_controller_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
-describe MyController, :type => :controller do
-
+describe MyController, type: :controller do
   it "sets the controller name" do
     expect(controller.controller_name).to eq :my
   end
-
 end

data/spec/controllers/pages_controller_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe PagesController, :type => :controller do
-  let(:page_name) {"about_page"}
+describe PagesController, type: :controller do
+  let(:page_name) { "about_page" }
   context "content exists" do
     describe "GET #show" do
       let(:page) { ContentBlock.create!(name: page_name, value: "foo bar") }
 
-      it "should update the node" do
+      it "updates the node" do
         get :show, id: page.name
         expect(response).to be_successful
         expect(assigns[:page]).to eq page
@@ -15,7 +15,7 @@ describe PagesController, :type => :controller do
   end
   context "content does not exist" do
     describe "GET #show" do
-      it "should create the node" do
+      it "creates the node" do
         get :show, id: "about_page"
         expect(response).to be_successful
         expect(assigns[:page]).not_to be_nil

data/spec/controllers/single_use_links_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe SingleUseLinksController, :type => :controller do
+describe SingleUseLinksController, type: :controller do
   let(:user) { FactoryGirl.find_or_create(:jill) }
 
   let(:file) do
@@ -51,7 +51,6 @@ describe SingleUseLinksController, :type => :controller do
         get 'new_download', id: file
         expect(response).not_to be_success
       end
-
     end
 
     describe "GET 'show'" do
@@ -59,7 +58,6 @@ describe SingleUseLinksController, :type => :controller do
         get 'new_show', id: file
         expect(response).not_to be_success
       end
-
     end
   end
 

data/spec/controllers/single_use_links_viewer_controller_spec.rb

@@ -30,7 +30,7 @@ describe SingleUseLinksViewerController do
       let(:expected_content) { ActiveFedora::Base.find(file.id).content.content }
 
       it "and_return http success" do
-        expect(controller).to receive(:send_file_headers!).with(filename: 'world.png', disposition: 'inline', type: 'image/png')
+        expect(controller).to receive(:send_file_headers!).with(filename: 'world.png', disposition: 'attachment', type: 'image/png')
         get :download, id: download_link_hash
         expect(response.body).to eq expected_content
         expect(response).to be_success
@@ -69,5 +69,4 @@ describe SingleUseLinksViewerController do
       end
     end
   end
-
 end

data/spec/controllers/static_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe StaticController, :type => :controller do
+describe StaticController, type: :controller do
   routes { Sufia::Engine.routes }
   describe "#mendeley" do
     it "renders page" do

data/spec/controllers/tinymce_assets_controller_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe TinymceAssetsController, :type => :controller do
-  let(:file) { fixture_file_upload('/world.png','image/png') }
+describe TinymceAssetsController, type: :controller do
+  let(:file) { fixture_file_upload('/world.png', 'image/png') }
 
   context "when logged in" do
     let(:user) { FactoryGirl.create(:user) }
@@ -10,19 +10,19 @@ describe TinymceAssetsController, :type => :controller do
     context "as a user who can upload" do
       before { expect(controller).to receive(:authorize!).with(:create, TinymceAsset).and_return(true) }
 
-      it "should upload the file" do
-        expect {
+      it "uploads the file" do
+        expect do
           post :create, file: file
           expect(response).to be_successful
-        }.to change{ TinymceAsset.count }.by(1)
+        end.to change { TinymceAsset.count }.by(1)
 
         json = JSON.parse(response.body)
-        expect(json).to eq({"image"=>{"url"=>"/uploads/tinymce_asset/file/1/world.png"}})
+        expect(json).to eq("image" => { "url" => "/uploads/tinymce_asset/file/1/world.png" })
       end
     end
 
     context "as a user who can't upload" do
-      it "should redirect to root path" do
+      it "redirects to root path" do
         post :create, file: file
         expect(response).to redirect_to root_path
       end
@@ -30,10 +30,9 @@ describe TinymceAssetsController, :type => :controller do
   end
 
   context "when not logged in" do
-    it "should redirect to root path" do
+    it "redirects to root path" do
       post :create, file: file
       expect(response).to redirect_to main_app.new_user_session_path
-
     end
   end
 end