hydra-collections 7.0.0 → 8.0.0

data/spec/factories/users.rb

@@ -1,16 +1,6 @@
 FactoryGirl.define do
   factory :user, :class => User do |u|
-    email 'jilluser@example.com'
-    password 'password'
-  end
-
-  factory :archivist, :class => User do |u|
-    email 'archivist1@example.com'
-    password 'password'
-  end
-
-  factory :curator, :class => User do |u|
-    email 'curator1@example.com'
+    sequence(:email) { |n| "user#{n}@example.com" }
     password 'password'
   end
 end

data/spec/features/create_collection_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe "Creating collection" do
+  let(:user) { FactoryGirl.create(:user) }
+  before do
+    login_as(user, scope: :user)
+    visit '/collections'
+  end
+
+  specify do
+    click_button 'Create Collection'
+    fill_in 'Title', with: 'Test title'
+    fill_in 'Description', with: 'Test description'
+    click_button 'Create Collection'
+    expect(page).to have_content 'Test title'
+  end
+end

data/spec/helpers/collections_helper_spec.rb

@@ -3,8 +3,21 @@ require 'spec_helper'
 include Hydra::Collections::Engine.routes.url_helpers
 
 describe CollectionsHelper, :type => :helper do
+  describe "has_collection_search_parameters?" do
+    subject { helper }
+    context "when cq is set" do
+      before { allow(helper).to receive(:params).and_return(cq: 'foo') }
+      it { is_expected.to have_collection_search_parameters }
+    end
+
+    context "when cq is not set" do
+      before { allow(helper).to receive(:params).and_return(cq: '') }
+      it { is_expected.not_to have_collection_search_parameters }
+    end
+  end
+
   describe "button_for_create_collection" do
-    it " should create a button to the collections new path" do
+    it "creates a button to the collections new path" do
       str = String.new(helper.button_for_create_collection)
       doc = Nokogiri::HTML(str)
       form = doc.xpath('//form').first
@@ -12,7 +25,8 @@ describe CollectionsHelper, :type => :helper do
       i = form.xpath('.//input').first
       expect(i.attr('type')).to eq('submit')
     end
-    it "should create a button with my text" do
+
+    it "creates a button with my text" do
       str = String.new(helper.button_for_create_collection "Create My Button")
       doc = Nokogiri::HTML(str)
       form = doc.xpath('//form').first
@@ -21,39 +35,37 @@ describe CollectionsHelper, :type => :helper do
       expect(i.attr('value')).to eq('Create My Button')
     end
   end
+
   describe "button_for_delete_collection" do
-    before do
-      @collection = Collection.create(title: "Test Public")
-    end
+    let(:collection) { FactoryGirl.create(:collection) }
 
-    it " should create a button to the collections delete path" do
-      str = button_for_delete_collection @collection
+    it "creates a button to the collections delete path" do
+      str = button_for_delete_collection collection
       doc = Nokogiri::HTML(str)
       form = doc.xpath('//form').first
-      expect(form.attr('action')).to eq collections.collection_path(@collection)
+      expect(form.attr('action')).to eq collections.collection_path(collection)
       i = form.xpath('.//input')[1]
       expect(i.attr('type')).to eq('submit')
     end
-    it "should create a button with my text" do
-      str = button_for_delete_collection @collection, "Delete My Button"
+    it "creates a button with my text" do
+      str = button_for_delete_collection collection, "Delete My Button"
       doc = Nokogiri::HTML(str)
       form = doc.xpath('//form').first
-      expect(form.attr('action')).to eq collections.collection_path(@collection)
+      expect(form.attr('action')).to eq collections.collection_path(collection)
       i = form.xpath('.//input')[1]
       expect(i.attr('value')).to eq("Delete My Button")
     end
   end
+
   describe "button_for_remove_from_collection" do
-    let(:item) { double(id: 'changeme:123') } 
-    before do
-      @collection = Collection.create
-    end
+    let(:item) { double(id: 'changeme:123') }
+    let(:collection) { FactoryGirl.create(:collection) }
 
-    it "should generate a form that can remove the item" do
-      str = button_for_remove_from_collection item
+    it "generates a form that can remove the item" do
+      str = button_for_remove_from_collection collection, item
       doc = Nokogiri::HTML(str)
       form = doc.xpath('//form').first
-      expect(form.attr('action')).to eq collections.collection_path(@collection)
+      expect(form.attr('action')).to eq collections.collection_path(collection)
       expect(form.css('input#collection_members[type="hidden"][value="remove"]')).not_to be_empty
       expect(form.css('input[type="hidden"][name="batch_document_ids[]"][value="changeme:123"]')).not_to be_empty
     end
@@ -64,52 +76,50 @@ describe CollectionsHelper, :type => :helper do
           include Hydra::Collection
           include Hydra::Works::WorkBehavior
         end
-
-        @collection = OtherCollection.create
       end
+
+      let!(:collection) { OtherCollection.create! }
+
       after(:all) do
         Object.send(:remove_const, :OtherCollection)
       end
 
-      it "should generate a form that can remove the item" do
-        str = button_for_remove_from_collection item
+      it "generates a form that can remove the item" do
+        str = button_for_remove_from_collection collection, item
         doc = Nokogiri::HTML(str)
         form = doc.xpath('//form').first
-        expect(form.attr('action')).to eq collections.collection_path(@collection)
+        expect(form.attr('action')).to eq collections.collection_path(collection)
         expect(form.css('input#collection_members[type="hidden"][value="remove"]')).not_to be_empty
         expect(form.css('input[type="hidden"][name="batch_document_ids[]"][value="changeme:123"]')).not_to be_empty
       end
-
     end
   end
 
   describe "button_for_remove_selected_from_collection" do
-    before do
-      @collection = Collection.create title: "Test Public"
-    end
+    let(:collection) { FactoryGirl.create(:collection) }
 
-    it " should create a button to the collections delete path" do
-      str = button_for_remove_selected_from_collection @collection
+    it "creates a button to the collections delete path" do
+      str = button_for_remove_selected_from_collection collection
       doc = Nokogiri::HTML(str)
       form = doc.xpath('//form').first
-      expect(form.attr('action')).to eq collections.collection_path(@collection)
+      expect(form.attr('action')).to eq collections.collection_path(collection)
       i = form.xpath('.//input')[2]
       expect(i.attr('value')).to eq("remove")
       expect(i.attr('name')).to eq("collection[members]")
     end
 
-    it "should create a button with my text" do
-      str = button_for_remove_selected_from_collection @collection, "Remove My Button"
+    it "creates a button with my text" do
+      str = button_for_remove_selected_from_collection collection, "Remove My Button"
       doc = Nokogiri::HTML(str)
       form = doc.css('form').first
-      expect(form.attr('action')).to eq collections.collection_path(@collection)
+      expect(form.attr('action')).to eq collections.collection_path(collection)
       expect(form.css('input[type="submit"]').attr('value').value).to eq "Remove My Button"
     end
   end
 
   describe "hidden_collection_members" do
     before { helper.params[:batch_document_ids] = ['foo:12', 'foo:23'] }
-    it "should make hidden fields" do
+    it "makes hidden fields" do
       doc = Nokogiri::HTML(hidden_collection_members)
       inputs = doc.xpath('//input[@type="hidden"][@name="batch_document_ids[]"]')
       expect(inputs.length).to eq(2)
@@ -117,5 +127,4 @@ describe CollectionsHelper, :type => :helper do
       expect(inputs[1].attr('value')).to eq('foo:23')
     end
   end
-
 end

data/spec/models/collection_spec.rb

@@ -2,13 +2,11 @@ require 'spec_helper'
 
 describe Collection, :type => :model do
   before(:all) do
-    @user = FactoryGirl.find_or_create(:user)
     class GenericFile < ActiveFedora::Base
       include Hydra::Works::WorkBehavior
     end
   end
   after(:all) do
-    @user.destroy
     Object.send(:remove_const, :GenericFile)
   end
 
@@ -16,10 +14,10 @@ describe Collection, :type => :model do
   let(:gf2) { GenericFile.create }
   let(:gf3) { GenericFile.create }
 
-  let(:user) { @user }
+  let(:user) { FactoryGirl.create(:user) }
 
   describe "#to_solr" do
-    let(:collection) { Collection.new(title: "A good title", depositor: user.user_key) }
+    let(:collection) { FactoryGirl.build(:collection, user: user, title: ['A good title']) }
 
     subject { collection.to_solr }
 
@@ -113,16 +111,16 @@ describe Collection, :type => :model do
     end
   end
 
-  it "should have a title" do
-    subject.title = "title"
+  it "has a title" do
+    subject.title = ["title"]
     subject.save
-    expect(subject.title).to eq "title"
+    expect(subject.reload.title).to eq ["title"]
   end
 
-  it "should have a description" do
-    subject.description = "description"
+  it "has a description" do
+    subject.description = ["description"]
     subject.save
-    expect(subject.reload.description).to eq "description"
+    expect(subject.reload.description).to eq ["description"]
   end
 
   describe "#destroy" do

data/spec/spec_helper.rb

@@ -29,6 +29,15 @@ RSpec.configure do |config|
   config.before(:each) do
     ActiveFedora::Cleaner.clean!
   end
+
+  config.include Warden::Test::Helpers
+  config.before :suite do
+    Warden.test_mode!
+  end
+
+  config.after :each do
+    Warden.test_reset!
+  end
 end
 
 module FactoryGirl

data/spec/test_app_templates/app/views/catalog/_sort_and_per_page.html.erb

@@ -1,8 +1,7 @@
 <div id="sortAndPerPage">
   <div id="sortAndPerPage" class="clearfix">
-    <%= render "paginate_compact", object: @response if show_pagination? %>
+    <%= render partial: "paginate_compact", object: @response if show_pagination? %>
     <%= button_for_create_collection %>
-    <%= render partial: 'collections/form_for_select_collection', locals: {user_collections: @user_collections}  %>
+    <%= render 'collections/form_for_select_collection', user_collections: @user_collections %>
   </div>
-
 </div>

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

@@ -51,10 +51,6 @@ class TestAppGenerator < Rails::Generators::Base
     copy_file "app/controllers/other_collections_controller.rb"
   end
 
-  def overwrite_blacklight_config
-    copy_file 'config/blacklight.yml', force: true
-  end
-
   # Inject javascript into application.js
   def inject_javascript
     insert_into_file "app/assets/javascripts/application.js", :after => '//= require_tree .' do

data/spec/views/collections/_form.html.erb_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe 'collections/_form.html.erb' do
+  before do
+    assign(:collection, stub_model(Collection))
+    render
+  end
+
+  it "draws the fields" do
+    expect(rendered).to have_css 'input#collection_title'
+    expect(rendered).to have_css 'label[for="collection_title"]'
+    expect(rendered).to have_css 'textarea#collection_description'
+    expect(rendered).to have_css 'label[for="collection_description"]'
+  end
+end

data/spec/views/collections/show.html.erb_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'collections/show.html.erb' do
   let(:response) { Blacklight::Solr::Response.new(sample_response, {}) }
-  let(:collection) { mock_model(Collection, id: '123', title: "My Collection", description: "Just a collection") }
+  let(:collection) { mock_model(Collection, id: '123', title: ["My Collection"], description: ["Just a collection"]) }
 
   let(:blacklight_config) { CatalogController.blacklight_config }
   let(:member_docs) { [ SolrDocument.new(id: '234'), SolrDocument.new(id: '456') ] }

data/tasks/hydra-collections-dev.rake

@@ -1,18 +1,18 @@
 require 'rspec/core'
 require 'rspec/core/rake_task'
-require 'jettywrapper'
+require 'solr_wrapper'
+require 'fcrepo_wrapper'
 require 'engine_cart/rake_task'
+require 'active_fedora/rake_support'
 
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.rspec_opts = ['--backtrace'] if ENV['CI']
 end
 
-desc 'Spin up hydra-jetty and run specs'
-task ci: ['engine_cart:clean', 'engine_cart:generate', 'jetty:clean'] do
+desc 'Start solr, fcrepo, and run specs'
+task ci: ['engine_cart:generate'] do
   puts 'running continuous integration'
-  jetty_params = Jettywrapper.load_config
-  error = Jettywrapper.wrap(jetty_params) do
+  with_test_server do
     Rake::Task['spec'].invoke
   end
-  raise "test failures: #{error}" if error
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-collections
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 8.0.0
 platform: ruby
 authors:
 - Carolyn Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '9.1'
+- !ruby/object:Gem::Dependency
+  name: active-fedora
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '9.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '9.9'
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
@@ -147,10 +161,8 @@ files:
 - app/controllers/concerns/hydra/collections_controller_behavior.rb
 - app/helpers/batch_select_helper.rb
 - app/helpers/collections_helper.rb
-- app/helpers/collections_search_helper.rb
 - app/models/collection.rb
 - app/models/concerns/hydra/collection.rb
-- app/models/concerns/hydra/collections/actions.rb
 - app/models/concerns/hydra/collections/metadata.rb
 - app/models/concerns/hydra/collections/solr_document_behavior.rb
 - app/models/solr_document.rb
@@ -183,16 +195,30 @@ files:
 - app/views/collections/new.html.erb
 - app/views/collections/show.html.erb
 - app/views/layouts/collections.html.erb
-- config/jetty.yml
 - config/routes.rb
 - gemfiles/rails3.gemfile
 - gemfiles/rails4.gemfile
 - hydra-collections.gemspec
 - lib/hydra-collections.rb
 - lib/hydra/collections/accepts_batches.rb
-- lib/hydra/collections/collectible.rb
 - lib/hydra/collections/search_service.rb
 - lib/hydra/collections/version.rb
+- solr/config/_rest_managed.json
+- solr/config/admin-extra.html
+- solr/config/elevate.xml
+- solr/config/mapping-ISOLatin1Accent.txt
+- solr/config/protwords.txt
+- solr/config/schema.xml
+- solr/config/scripts.conf
+- solr/config/solrconfig.xml
+- solr/config/spellings.txt
+- solr/config/stopwords.txt
+- solr/config/stopwords_en.txt
+- solr/config/synonyms.txt
+- solr/config/xslt/example.xsl
+- solr/config/xslt/example_atom.xsl
+- solr/config/xslt/example_rss.xsl
+- solr/config/xslt/luke.xsl
 - solr_conf/conf/schema.xml
 - solr_conf/conf/solrconfig.xml
 - solr_conf/solr.xml
@@ -203,9 +229,8 @@ files:
 - spec/controllers/selects_collections_spec.rb
 - spec/factories.rb
 - spec/factories/users.rb
+- spec/features/create_collection_spec.rb
 - spec/helpers/collections_helper_spec.rb
-- spec/helpers/collections_search_helper_spec.rb
-- spec/lib/collectible_spec.rb
 - spec/lib/search_service_spec.rb
 - spec/models/collection_spec.rb
 - spec/spec_helper.rb
@@ -216,14 +241,13 @@ files:
 - spec/test_app_templates/app/views/catalog/_document_header.html.erb
 - spec/test_app_templates/app/views/catalog/_index_collection.html.erb
 - spec/test_app_templates/app/views/catalog/_sort_and_per_page.html.erb
-- spec/test_app_templates/config/blacklight.yml
 - spec/test_app_templates/db/migrate/20111101221803_create_searches.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/test_app_templates/lib/tasks/rspec.rake
+- spec/views/collections/_form.html.erb_spec.rb
 - spec/views/collections/_thumbnail_default.html.erb_spec.rb
 - spec/views/collections/show.html.erb_spec.rb
 - tasks/hydra-collections-dev.rake
-- tasks/jetty.rake
 homepage: https://github.com/projecthydra/hydra-collections
 licenses:
 - APACHE2
@@ -244,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A rails engine for managing Hydra Collections
@@ -256,9 +280,8 @@ test_files:
 - spec/controllers/selects_collections_spec.rb
 - spec/factories.rb
 - spec/factories/users.rb
+- spec/features/create_collection_spec.rb
 - spec/helpers/collections_helper_spec.rb
-- spec/helpers/collections_search_helper_spec.rb
-- spec/lib/collectible_spec.rb
 - spec/lib/search_service_spec.rb
 - spec/models/collection_spec.rb
 - spec/spec_helper.rb
@@ -269,9 +292,9 @@ test_files:
 - spec/test_app_templates/app/views/catalog/_document_header.html.erb
 - spec/test_app_templates/app/views/catalog/_index_collection.html.erb
 - spec/test_app_templates/app/views/catalog/_sort_and_per_page.html.erb
-- spec/test_app_templates/config/blacklight.yml
 - spec/test_app_templates/db/migrate/20111101221803_create_searches.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/test_app_templates/lib/tasks/rspec.rake
+- spec/views/collections/_form.html.erb_spec.rb
 - spec/views/collections/_thumbnail_default.html.erb_spec.rb
 - spec/views/collections/show.html.erb_spec.rb