sufia 3.7.0 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd1c1d869e175044e6997471f0e6c3dcf2e89cbc
-  data.tar.gz: 8020119fe464f600fc9d645d543ded8f053da959
+  metadata.gz: 6d9ca86c363c0d4e38d76b587a487b97f675c016
+  data.tar.gz: d1a9151de4fa4bb651ddee3b1aabf246c167cc56
 SHA512:
-  metadata.gz: 051e1e361d4cf1403c1ad55619403efab4dae5a5c72d1d427034c1124a3f07ebebd9c2473c12c8f341b0464c8f1f603e87accb2bc8bfacac3dfd344c650a873c
-  data.tar.gz: df859a53507cff81e851d5f318990f7cc69f5db67fa70de01cbca865138c665b31f7ff5124915d9d6cd26d4da7679ecfd18f07791199fd41183476f7c74a4998
+  metadata.gz: 0f444ca293e68574e34d8defb7b82d9d57d360d3a3526f58e7b42ab86da48f66551e7b1769ce778e573f83b5efcda300e1e1325e0bf0968eaf991c33a7416f91
+  data.tar.gz: d6ad98fbb7809d6e828c740de33085e486016716a4329439300d29441a0bbea3969f7de606eca80cba9307ae083ca85281bc32538f821854e72873a355ed9d2f

data/SUFIA_VERSION

@@ -1 +1 @@
-3.7.0
+3.7.1

data/app/controllers/concerns/sufia/users_controller_behavior.rb

@@ -17,7 +17,7 @@ module Sufia::UsersControllerBehavior
     unless query.blank?
       base = base.where("#{Devise.authentication_keys.first} like lower(?) OR display_name like lower(?)", query, query)
     end
-    @users = base.order(sort_val).page(params[:page]).per(10)
+    @users = base.references(:trophies).order(sort_val).page(params[:page]).per(10)
 
     respond_to do |format|
       format.html

data/app/controllers/static_controller.rb

@@ -1,3 +1,16 @@
 class StaticController < ApplicationController
   rescue_from AbstractController::ActionNotFound, :with => :render_404
+
+  def zotero
+    respond_to do |format|
+      format.html
+      format.js { render :layout => false }
+    end
+  end
+  def mendeley
+    respond_to do |format|
+      format.html
+      format.js { render :layout => false }
+    end
+  end
 end

data/app/views/advanced/_advanced_search_form.html.erb

@@ -1,22 +1,6 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
 <%= form_tag catalog_index_path, :class => 'form-horizontal', :method => :get do  %>
 
-  <%= search_as_hidden_fields(:params => advanced_search_context ) %>  
+  <%= render_hash_as_hidden_fields(params_for_search(advanced_search_context)) %>
 
   <div> 
 	      
@@ -32,14 +16,6 @@ limitations under the License.
           <%= render 'advanced/advanced_search_fields' %>
         </div>        
     </div>
-    <!-- 
-    <div class="limit_column column">      
-      <div class="alert alert-info"><strong>AND</strong> have these attributes:</div>
-      <div> 
-          <%# render 'advanced_search_facets' %>
-      </div>
-    </div>
-    -->
   </div>
   
   <% unless (search_context_str = render_search_to_s( advanced_search_context)).blank? %>
@@ -50,7 +26,7 @@ limitations under the License.
   <% end %>
   
   
-  <div class="form-actions"
+  <div class="form-actions">
     <%= label_tag(:sort, "Sort results by") %> 
     <%= select_tag(:sort, options_for_select(sort_fields, h(params[:sort]))) %>
     <%= hidden_field_tag(:search_field, blacklight_config.advanced_search[:url_key]) %>

data/app/views/catalog/_search_form.html.erb

@@ -2,15 +2,11 @@
 <% q = params[:controller] == 'dashboard' ? nil : params[:q] %>
 
 <%= form_tag catalog_index_path, :method => :get, :id => "search-form-header" do %>
-  <%= search_as_hidden_fields(:omit_keys => [:q, :search_field, :qt, :page]).html_safe %>
-            <div class="controls">
-              <div class="input-append">
-              <label class="accessible-hidden"><%= t('sufia.search.form.q.label') %></label> 
-              <%= text_field_tag :q, q, :class => "q span50", :id => "search-field-header", :placeholder => t('sufia.search.form.q.placeholder') %><button type="submit" class="btn btn-info" id="search-submit-header"><i class="icon-search"></i> Go</button>
-  <!-- <input type="submit" class="btn btn-info" id="search-submit-header" value="GO"><i class="icon-search"></i></input>
-&nbsp; -->
- <%# link_to 'more options', params.merge(:controller=>"advanced", :action=>"index") , :class=>"advanced_search" if ! current_page?(advanced_path)%>
- <%# link_to 'less options', :back , :class=>"advanced_search" if current_page?(advanced_path)%>
-              </div>
-            </div>
+  <%= render_hash_as_hidden_fields(params_for_search().except(:q, :search_field, :qt, :page, :utf8)) %>
+  <div class="controls">
+    <div class="input-append">
+    <label class="accessible-hidden"><%= t('sufia.search.form.q.label') %></label> 
+    <%= text_field_tag :q, q, :class => "q span50", :id => "search-field-header", :placeholder => t('sufia.search.form.q.placeholder') %><button type="submit" class="btn btn-info" id="search-submit-header"><i class="icon-search"></i> Go</button>
+    </div>
+  </div>
 <% end %>

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

@@ -1,16 +1,15 @@
 <% unless @response.response['numFound'] < 2 %>
-    <%-# kind of hacky way to get this to work on catalog and folder controllers.  May be able to simple do {:action=>"index"} but I'm not sure -%>
-    <%= form_tag params[:controller] == "folder" ? folder_index_path : catalog_index_path, :method => :get, :class => "well form-inline" do %>
-  <div class="sorting">
+  <%= form_tag catalog_index_path, :method => :get, :class => "well form-inline" do %>
+    <div class="sorting">
       <%= label_tag(:sort, "<strong>Sort by</strong> ".html_safe) %>
       <%= select_tag(:sort, options_for_select(sort_fields, h(params[:sort])), :class => "input-medium") %>
 
       <%= label_tag(:per_page) do %>
         <strong>Show</strong> <%= select_tag(:per_page, options_for_select(['10', '20', '50', '100'], h(params[:per_page])), :title => "Number of results to display per page", :class => "input-small")  %> per page
         <% end %>
-      <%= search_as_hidden_fields(:omit_keys => [:per_page, :sort]) %>
+      <%= render_hash_as_hidden_fields(params_for_search().except(:per_page, :sort, :utf8)) %>
       <button class="btn btn-primary"><i class="icon-refresh"></i> Refresh</button>
 
-  </div>
-    <% end %>
+    </div>
+  <% end %>
 <% end %>

data/app/views/dashboard/_search_form.html.erb

@@ -1,26 +1,9 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
 <div style="float: right;" >
-    <%= form_tag sufia.dashboard_index_path, :method => :get, :class => "well form-search" do %>
-      <label class="accessible-hidden">Search My Dashboard</label>
-      <%= text_field_tag :q, params[:q], :class => "q", :placeholder => "Search My Dashboard", :size => '30', :type => "search", :id => "dashboard_search" %>
-      <%= hidden_field_tag :search_field, 'all_fields' %>
-    <%= search_as_hidden_fields(:omit_keys => [:q, :search_field, :qt, :page]).html_safe %>
-    <%# submit_tag 'Go', {:class=>'btn btn-primary', :id => "dashboard_submit"} %>
+  <%= form_tag sufia.dashboard_index_path, :method => :get, :class => "well form-search" do %>
+    <label class="accessible-hidden">Search My Dashboard</label>
+    <%= text_field_tag :q, params[:q], :class => "q", :placeholder => "Search My Dashboard", :size => '30', :type => "search", :id => "dashboard_search" %>
+    <%= hidden_field_tag :search_field, 'all_fields' %>
+    <%= render_hash_as_hidden_fields(params_for_search().except(:q, :search_field, :qt, :page, :utf8)) %>
     <button type="submit" class="btn btn-primary" id="dashboard_submit">
       <i class="icon-search"></i> Go
     </button>

data/app/views/dashboard/_sort_and_per_page.html.erb

@@ -1,32 +1,15 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
 <div class="batch-info"> 
-   <% session[:batch_edit_state] = "on" %>
-    <%=batch_delete%> <%=batch_edit_continue("Edit Selected") %>   
+  <% session[:batch_edit_state] = "on" %>
+  <%=batch_delete%> <%=batch_edit_continue("Edit Selected") %>   
 	<% unless @response.response['numFound'] < 2 %>
-	  <%-# kind of hacky way to get this to work on catalog and folder controllers.  May be able to simple do {:action=>"index"} but I'm not sure -%>
-    <%= form_tag params[:controller] == "folder" ? sufia.folder_index_path : sufia.dashboard_index_path, :method=>:get, :class=>'per_page form-inline' do %>
+    <%= form_tag sufia.dashboard_index_path, :method=>:get, :class=>'per_page form-inline' do %>
       <%= label_tag(:sort, "<span>Sort By:</span>".html_safe) %>
       <%= select_tag(:sort, options_for_select(sort_fields, h(params[:sort])), :class => "span15") %>			      
       &nbsp;&nbsp;&nbsp;
       <%= label_tag(:per_page) do %>
         Show <%= select_tag(:per_page, options_for_select(['10', '20', '50', '100'], h(params[:per_page])), :title => "Number of results to display per page", :class => "span10") %> per page
         <% end %>
-        <%= search_as_hidden_fields(:omit_keys => [:per_page, :sort]) %>
+        <%= render_hash_as_hidden_fields(params_for_search().except(:per_page, :sort, :utf8)) %>
         &nbsp;&nbsp;&nbsp;
         <button class="btn btn-primary"><i class="icon-refresh"></i> Refresh</button>
 		<% end unless sort_fields.empty? %>

data/app/views/static/mendeley.html.erb

@@ -18,5 +18,5 @@ limitations under the License.
 <p>
 Exporting to Mendeley is supported via embedded metadata.  If Mendeley
 does not automatically pick up metadata for deposited files, please
-report the issue via the  <%= link_to 'Contact Form', contact_form_index_path %>.
+report the issue via the  <%= link_to 'Contact Form', sufia.contact_form_index_path %>.
 </p>

data/app/views/static/zotero.html.erb

@@ -18,5 +18,5 @@ limitations under the License.
 <p>
 Exporting to Zotero is supported via embedded metadata.  If Zotero
 does not automatically pick up metadata for deposited files, please
-report the issue via the  <%= link_to 'Contact Form', contact_form_index_path %>.
+report the issue via the  <%= link_to 'Contact Form', sufia.contact_form_index_path %>.
 </p>

data/app/views/users/_search_form.html.erb

@@ -1,9 +1,9 @@
 <div style="float: right;" >
-    <%= form_tag sufia.profiles_path, :method => :get, :class => "well form-search" do %>
-      <label class="accessible-hidden">Search Users</label>
-      <%= text_field_tag :uq, params[:uq], :class => "q", :placeholder => "Search Users", :size => '30', :type => "search", :id => "user_search" %>
-      <%= hidden_field_tag :sort, params[:sort], :id => 'user_sort' %>
-     <%= search_as_hidden_fields(:omit_keys => [:uq, :sort, :qt, :page]).html_safe %>
+  <%= form_tag sufia.profiles_path, :method => :get, :class => "well form-search" do %>
+    <label class="accessible-hidden">Search Users</label>
+    <%= text_field_tag :uq, params[:uq], :class => "q", :placeholder => "Search Users", :size => '30', :type => "search", :id => "user_search" %>
+    <%= hidden_field_tag :sort, params[:sort], :id => 'user_sort' %>
+    <%= render_hash_as_hidden_fields(params_for_search().except(:uq, :sort, :qt, :page, :utf8)) %>
     <button type="submit" class="btn btn-primary" id="user_submit"> 
       <i class="icon-search"></i> Go
     </button>

data/app/views/users/index.html.erb

@@ -26,6 +26,6 @@
         </tbody> 
     </table> 
     <div class="pager">
-      <%= paginate @users,  :theme => 'blacklight'%>
+      <%= paginate @users,  :theme => 'blacklight', :route_set=> sufia%>
     </div>
 </div> 

data/spec/controllers/batch_controller_spec.rb

@@ -39,15 +39,12 @@ describe BatchController do
       Sufia.queue.should_receive(:push).with(s1).once
       post :update, :id=>@batch.pid, "generic_file"=>{"read_groups_string"=>"", "read_users_string"=>"archivist1, archivist2", "tag"=>[""]}     
     end
-    describe "when views are shown" do
-      render_views
-      it "should show flash messages" do
-        post :update, :id=>@batch.pid, "generic_file"=>{"read_groups_string"=>"","read_users_string"=>"archivist1, archivist2", "tag"=>[""]}
-        response.should redirect_to @routes.url_helpers.dashboard_index_path
-        flash[:notice].should_not be_nil
-        flash[:notice].should_not be_empty
-        flash[:notice].should include("Your files are being processed")
-      end
+    it "should show flash messages" do
+      post :update, :id=>@batch.pid, "generic_file"=>{"read_groups_string"=>"","read_users_string"=>"archivist1, archivist2", "tag"=>[""]}
+      response.should redirect_to @routes.url_helpers.dashboard_index_path
+      flash[:notice].should_not be_nil
+      flash[:notice].should_not be_empty
+      flash[:notice].should include("Your files are being processed")
     end
     
     describe "when user has edit permissions on a file" do

data/spec/controllers/dashboard_controller_spec.rb

@@ -66,17 +66,14 @@ describe DashboardController do
         response.should render_template('dashboard/index')
       end
       it "should return an array of documents I can edit" do
-        editable_docs_response = Blacklight.solr.get "select", :params=>{:fq=>["edit_access_group_ssim:public OR edit_access_person_ssim:#{@user.user_key}"]}
+        editable_docs_response = ActiveFedora::SolrService.instance.conn.get "select", :params=>{:fq=>["edit_access_group_ssim:public OR edit_access_person_ssim:#{@user.user_key}"]}
         assigns(:result_set_size).should eql(editable_docs_response["response"]["numFound"])
         assigns(:document_list).each {|doc| doc.should be_kind_of SolrDocument}
       end
-      context "with render views" do
-        render_views
-        it "should paginate" do          
-          xhr :get, :index, per_page: 2
-          response.should be_success
-          response.should render_template('dashboard/index')
-        end
+      it "should paginate" do          
+        xhr :get, :index, per_page: 2
+        response.should be_success
+        response.should render_template('dashboard/index')
       end
     end
   end

data/spec/controllers/generic_files_controller_spec.rb

@@ -438,7 +438,6 @@ describe GenericFilesController do
         flash[:alert].should be_nil
       end
       describe "failing audit" do
-        render_views
         before do
           ActiveFedora::RelsExtDatastream.any_instance.stub(:dsChecksumValid).and_return(false)
           @archivist = FactoryGirl.find_or_create(:archivist)
@@ -449,7 +448,6 @@ describe GenericFilesController do
           AuditJob.new(@file.pid, @ds[0], @ds[1].versionID).run
           get :show, id:"test5"
           assigns[:notify_number].should == 1
-          response.body.should include('<span id="notify_number" class="overlay"> 1</span>') # notify should be 1 for failing job
           @archivist.mailbox.inbox[0].messages[0].subject.should == "Failing Audit Run"
         end
       end

data/spec/controllers/static_controller_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe StaticController do
+  routes { Sufia::Engine.routes }
+  describe "#mendeley" do
+    it "renders page" do
+      get "mendeley"
+      response.should be_success
+      response.should render_template "layouts/homepage"
+    end
+    it "renders no layout with javascript" do
+      get "mendeley" ,{format:"js"}
+      response.should be_success
+      response.should_not render_template "layouts/homepage"
+    end
+  end
+
+  describe "#zotero" do
+    it "renders page" do
+      get "zotero"
+      response.should be_success
+      response.should render_template "layouts/homepage"
+    end
+    it "renders no layout with javascript" do
+      get "zotero" ,{format:"js"}
+      response.should be_success
+      response.should_not render_template "layouts/homepage"
+    end
+  end
+end

data/spec/controllers/users_controller_spec.rb

@@ -65,6 +65,37 @@ describe UsersController do
         json.map{|u| u['text']}.should include(@u1.email, @u2.email)
       end
     end
+    describe "query users"  do
+      it "finds the expected user via email" do
+        get :index,  uq: @u1.email
+        assigns[:users].should include(@u1)
+        assigns[:users].should_not include(@u2)
+        response.should be_successful
+      end
+      it "finds the expected user via display name" do
+        @u1.display_name = "Dr. Curator"
+        @u1.save
+        @u2.display_name = "Jr. Architect"
+        @u2.save
+        User.any_instance.stub(:display_name).and_return("Dr. Curator", "Jr.Archivist")
+        get :index,  uq: @u1.display_name
+        assigns[:users].should include(@u1)
+        assigns[:users].should_not include(@u2)
+        response.should be_successful
+        @u1.display_name = nil
+        @u1.save
+        @u2.display_name = nil
+        @u2.save
+      end
+      it "uses the base query" do
+        u3 = FactoryGirl.find_or_create(:user)
+        controller.stub(:base_query).and_return(['email == "jilluser@example.com"'])
+        get :index
+        assigns[:users].should include(u3)
+        assigns[:users].should_not include(@u1, @u2)
+        u3.destroy
+      end
+    end
   end
   describe "#edit" do
     it "show edit form when user edits own profile" do

data/spec/views/users/_notify_number.html.erb_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe 'users/_notify_number.html.erb' do
+
+  it "should draw user list" do
+    assign :notify_number, 8
+    render
+    page = Capybara::Node::Simple.new(rendered)
+    expect(page).to have_selector("span#notify_number.overlay", text: ' 8')
+  end
+
+end
+

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

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe 'users/index.html.erb' do
+
+  let(:join_date) { 5.days.ago }
+  before do
+    users = []
+    (1..25).each  {|i| users << stub_model(User, name: "name#{i}", user_key: "user#{i}", created_at: join_date)}
+    User.stub_chain(:all).and_return(users)
+    relation = User.all
+    allow(relation).to receive(:limit_value).and_return(10)
+    allow(relation).to receive(:current_page).and_return(1)
+    allow(relation).to receive(:total_pages).and_return(3)
+    assign(:users, relation)
+  end
+
+  it "should draw user list" do
+    render
+    page = Capybara::Node::Simple.new(rendered)
+    expect(page).to have_content("ScholarSphere Users")
+    (1..10).each  do |i|
+      expect(page).to have_content("user#{i}")
+    end
+  end
+
+end

data/sufia-models/sufia-models.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activeresource' # No longer a dependency of rails 4.0
 
   spec.add_dependency "blacklight", "~> 4.7.0"
-  spec.add_dependency "hydra-head", "~> 6.4.1"
+  spec.add_dependency "hydra-head", "~> 6.5.0"
   spec.add_dependency "rubydora", "~> 1.7.0"
   spec.add_dependency 'nest', '~> 1.1.1'
   spec.add_dependency 'resque', '~> 1.23'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.7.1
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sufia-models
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.7.1
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -502,7 +502,6 @@ files:
 - solr_conf/solr.xml
 - spec/.gitignore
 - spec/active_fedora/unsaved_digital_object_spec.rb
-- spec/controllers/_sort_and_per_page.html.erb
 - spec/controllers/authorities_controller_spec.rb
 - spec/controllers/batch_controller_spec.rb
 - spec/controllers/batch_edits_controller_spec.rb
@@ -513,6 +512,7 @@ files:
 - spec/controllers/mailbox_controller_spec.rb
 - spec/controllers/single_use_links_controller_spec.rb
 - spec/controllers/single_use_links_viewer_controller_spec.rb
+- spec/controllers/static_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
 - spec/factories/checksum_audit_logs.rb
 - spec/factories/generic_files.rb
@@ -592,6 +592,8 @@ files:
 - spec/views/dashboard/facet_limit.html.erb_spec.rb
 - spec/views/dashboard/index_partials/_thumbnail_display.html.erb_spec.rb
 - spec/views/generic_file/edit.html.erb_spec.rb
+- spec/views/users/_notify_number.html.erb_spec.rb
+- spec/views/users/index.html.erb_spec.rb
 - spec/views/users/show.html.erb_spec.rb
 - sufia-models/.gitignore
 - sufia-models/Gemfile
@@ -741,7 +743,6 @@ summary: Sufia was extracted from ScholarSphere developed by Penn State Universi
 test_files:
 - spec/.gitignore
 - spec/active_fedora/unsaved_digital_object_spec.rb
-- spec/controllers/_sort_and_per_page.html.erb
 - spec/controllers/authorities_controller_spec.rb
 - spec/controllers/batch_controller_spec.rb
 - spec/controllers/batch_edits_controller_spec.rb
@@ -752,6 +753,7 @@ test_files:
 - spec/controllers/mailbox_controller_spec.rb
 - spec/controllers/single_use_links_controller_spec.rb
 - spec/controllers/single_use_links_viewer_controller_spec.rb
+- spec/controllers/static_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
 - spec/factories/checksum_audit_logs.rb
 - spec/factories/generic_files.rb
@@ -831,4 +833,6 @@ test_files:
 - spec/views/dashboard/facet_limit.html.erb_spec.rb
 - spec/views/dashboard/index_partials/_thumbnail_display.html.erb_spec.rb
 - spec/views/generic_file/edit.html.erb_spec.rb
+- spec/views/users/_notify_number.html.erb_spec.rb
+- spec/views/users/index.html.erb_spec.rb
 - spec/views/users/show.html.erb_spec.rb

data/spec/controllers/_sort_and_per_page.html.erb

@@ -1,16 +0,0 @@
-<% unless @response.response['numFound'] < 2 %>
-    <%-# kind of hacky way to get this to work on catalog and folder controllers.  May be able to simple do {:action=>"index"} but I'm not sure -%>
-    <%= form_tag params[:controller] == "folder" ? folder_index_path : catalog_index_path, :method => :get, :class => "well form-inline" do %>
-  <div class="sorting">
-      <%= label_tag(:sort, "<strong>Sort by</strong> ".html_safe) %>
-      <%= select_tag(:sort, options_for_select(sort_fields, h(params[:sort])), :class => "input-medium") %>
-
-      <%= label_tag(:per_page) do %>
-        <strong>Show</strong> <%= select_tag(:per_page, options_for_select(['10', '20', '50', '100'], h(params[:per_page])), :title => "Number of results to display per page", :class => "input-small")  %> per page
-        <% end %>
-      <%= search_as_hidden_fields(:omit_keys => [:per_page, :sort]) %>
-      <button class="btn btn-primary"><i class="icon-refresh"></i> Update</button>
-
-  </div>
-    <% end %>
-<% end %>