enju_flower 0.1.0.pre20 → 0.1.0.pre21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19b749d2a2f3d7f0b7719deb2734aea377fdfbdf
-  data.tar.gz: a1627e416e8c0623ca11476b37c5a40823c477a4
+  metadata.gz: 6a29725c815c423e7e63834ee36608293da680f7
+  data.tar.gz: 5cd2c0d902c8e496e28224293fe74ca67efc3086
 SHA512:
-  metadata.gz: c76f189a4ee49c5baf20bbe16e8694fd228a9505d5e55dcaa536d9f6ed06acede814b5884869bd2d2aca167d00034a7e2a6734ef300fb6b7bed3ae3d391a4623
-  data.tar.gz: 6ded3b085c8e1c88711c11a0e0637c351a78d5962b09775197be2398caa22b91ddd553e885a120170b97cf05a5ad6126c2188bb4021b4bde472467f57274de12
+  metadata.gz: 51d303040a75ed74611b6c10c72df22384181bb493d33a4023fed603809db54d680d634edc42e3547d3c1235744d54cce8107f5743aa3b48468cb6ec4b2fdf6e
+  data.tar.gz: fa1bc26884469517300e527e955060e570d2647efe6e0f1af25167e5b9a7de83112865ad72e83ae919f926b8b26bbcfaf0f37702e79819e80e015ebd967a481e

data/README.rdoc

@@ -1,4 +1,7 @@
 = Next-L Enju Flower
+{<img src="https://travis-ci.org/next-l/enju_flower.png?branch=1.1" alt="Build Status" />}[https://travis-ci.org/next-l/enju_flower]
+{<img src="https://coveralls.io/repos/next-l/enju_flower/badge.png?branch=1.1" alt="Coverage Status" />}[https://coveralls.io/r/next-l/enju_flower?branch=1.1]
+{<img src="https://hakiri.io/github/next-l/enju_flower/1.1.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_flower/1.1]
 
 == Related projects
 * {Next-L Enju Root}[https://github.com/next-l/enju_root]

data/app/views/manifestations/_index_form_series_statement.html.erb

@@ -9,7 +9,7 @@
     <%= label_tag :search_form_top, t('page.search_term') -%>:
     <%= search_field_tag 'query', h(@query), {id: 'search_form_top', class: 'search_form', placeholder: t('page.search_term')} -%>
     <%= hidden_field_tag 'reservable', h(@reservable) if @reservable -%>
-    <% if can? :update, Manifestation %>
+    <% if can? :create, Manifestation %>
       <%= render 'page/add' %>
     <% end %>
     <%= submit_tag t('page.search') -%>

data/app/views/manifestations/_manifestation.html.erb

@@ -44,7 +44,10 @@
               <% end %>
               <%- if can? :update, manifestation -%>
                 <% unless params[:mode] == 'add' %>
-                  <%= link_to image_tag('icons/book_edit.png', size: '16x16', alt: t('page.edit')), edit_manifestation_path(manifestation) -%>
+                  <% if manifestation.serial? && manifestation.series_master? %>
+                    <%= link_to t('page.new_acquisition'), new_manifestation_path(parent_id: manifestation.id) %>
+                  <% end %>
+                  <%= link_to t('page.edit'), edit_manifestation_path(manifestation) -%>
                 <% else %>
                   <% case %>
                   <% when @parent %>

data/app/views/manifestations/_show_detail_librarian.html.erb

@@ -106,7 +106,9 @@
         </tr>
       </table>
     <% end %>
-      <%= render 'manifestations/show_holding', manifestation: manifestation -%>
+      <%- if manifestation.items.on_shelf.exists? -%>
+        <%= render 'manifestations/show_holding', manifestation: manifestation -%>
+      <%- end -%>
     </div>
     <%= render 'manifestations/tab_list', manifestation: manifestation %>
   </div>

data/app/views/manifestations/_show_holding.html.erb

@@ -37,7 +37,12 @@
       <% if defined?(EnjuCirculation) %>
         <td>
           <%= item.circulation_status.display_name.localize if item.circulation_status -%>
+          <% if item.retained? %>
+            <br />
+            <%= t('reserve.retained') %>
+          <% end %>
           <% if item.rent? %>
+            <br />
             (
               <%= t('activerecord.attributes.checkout.due_date') -%>:
               <%= l(item.latest_checkout.due_date, format: :short) -%>

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

@@ -55,9 +55,13 @@
     </p>
 
     <div class="autopagerize_page_element" id="list">
-      <%= render 'manifestations/list', manifestations: @manifestations -%>
-    </div>
+      <table class="table table-striped index" id="manifestation_list">
+        <%= render @manifestations %>
+      </table>
 
+      <%= paginate(@manifestations) -%>
+      <br />
+    </div>
     <% if defined?(EnjuBookmark) %>
       <div id="tag_cloud">
         <h3 class="resource_title"><%= t('activerecord.models.tag') -%></h3>
@@ -67,6 +71,7 @@
       </div>
     <% end %>
   <%- else -%>
+    <!-- TODO: 検索結果が少ない場合にも表示させる -->
     <%= render 'manifestations/not_found' -%>
   <%- end -%>
 

data/app/views/manifestations/index.mobile.erb

@@ -18,4 +18,4 @@
 <% end %>
 </ul>
 
-<%= paginate(@manifestations, :window => 0, :theme => 'enju_leaf_mobile') %>
+<%= paginate(@manifestations, window: 0, theme: 'enju_leaf_mobile') %>

data/app/views/manifestations/index.rdf.builder

@@ -1,4 +1,4 @@
-xml.instruct! :xml, :version=>"1.0"
+xml.instruct! :xml, version: "1.0"
 xml.rdf(:RDF,
         'xmlns'  => "http://purl.org/rss/1.0/",
         'xmlns:rdf'  => "http://www.w3.org/1999/02/22-rdf-syntax-ns#",

data/app/views/manifestations/index.rss.builder

@@ -1,4 +1,4 @@
-xml.instruct! :xml, :version=>"1.0"
+xml.instruct! :xml, version: "1.0"
 xml.rss('version' => "2.0",
         'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/",
         'xmlns:dc' => "http://purl.org/dc/elements/1.1/",
@@ -16,7 +16,7 @@ xml.rss('version' => "2.0",
       xml.tag! "opensearch:totalResults", @manifestations.total_count
       xml.tag! "opensearch:startIndex", @manifestations.offset_value + 1
       xml.tag! "opensearch:itemsPerPage", @manifestations.limit_value
-      xml.tag! "opensearch:Query", role: 'request', :searchTerms => h(params[:query]), :startPage => (h(params[:page]) || 1)
+      xml.tag! "opensearch:Query", role: 'request', searchTerms: h(params[:query]), startPage: (h(params[:page]) || 1)
     end
     if @manifestations
       @manifestations.each do |manifestation|
@@ -29,7 +29,7 @@ xml.rss('version' => "2.0",
             end
             xml.pubDate manifestation.date_of_publication.try(:utc).try(:rfc822)
             xml.link manifestation_url(manifestation)
-            xml.guid manifestation_url(manifestation), :isPermaLink => "true"
+            xml.guid manifestation_url(manifestation), isPermaLink: "true"
             manifestation.identifier_contents(:isbn).each do |i|
               xml.tag! "dc:identifier", i
             end

data/app/views/manifestations/index.sru.builder

@@ -97,5 +97,5 @@ def value_sort(hash)
 end
 
 xml = Builder::XmlMarkup.new :indent => 2
-xml.instruct! directive_tag=:xml, :encoding=> 'UTF-8'
+xml.instruct! directive_tag=:xml, :encoding => 'UTF-8'
 search_retrieve_response!(xml)

data/app/views/manifestations/show.html.erb

@@ -59,7 +59,7 @@
               <% if @manifestation.is_reservable_by?(current_user) %>
                 <li><%= link_to_reservation(@manifestation, @reserve) %>
                 <br />
-                (<%= t('page.number_of_reservations', count: @reserved_count) -%>)</li>
+                (<%= link_to_if(current_user.has_role?('Librarian'), t('page.number_of_reservations', count: @reserved_count), reserves_path(query: "manifestation_id_i:#{@manifestation.id}")) -%>)</li>
               <%- else -%>
                 <% if defined?(EnjuPurchaseRequest) %>
                   <li><%= link_to t('activerecord.models.purchase_request'), new_purchase_request_path(purchase_request: {url: manifestation_url(@manifestation)}) %></li>

data/app/views/manifestations/show.mobile.erb

@@ -14,7 +14,7 @@
 <td><%= @manifestation.price %></td>
 </tr>
 </table>
-<%- if @manifestation.items.on_shelf.exists? -%>
+<%- if @manifestation.items.for_checkout.on_shelf.exists? -%>
   <%= render 'manifestations/show_holding', manifestation: @manifestation -%>
 <%- end -%>
 </div>

data/app/views/manifestations/show.mods.builder

@@ -1,4 +1,4 @@
-xml.instruct! :xml, :version=>"1.0"
+xml.instruct! :xml, version: "1.0"
 xml.mods('version' => "3.3",
         'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance",
         'xmlns' => "http://www.loc.gov/mods/v3"){

data/app/views/manifestations/show.rdf.builder

@@ -1,4 +1,4 @@
-xml.instruct! :xml, :version=>"1.0"
+xml.instruct! :xml, version: "1.0"
 xml.rdf(:RDF,
         'xmlns'  => "http://purl.org/rss/1.0/",
         'xmlns:rdf'  => "http://www.w3.org/1999/02/22-rdf-syntax-ns#",

data/lib/enju_flower/version.rb

@@ -1,3 +1,3 @@
 module EnjuFlower
-  VERSION = "0.1.0.pre20"
+  VERSION = "0.1.0.pre21"
 end

data/spec/controllers/manifestations_controller_spec.rb

@@ -17,7 +17,7 @@ describe ManifestationsController do
 
       it "assigns all manifestations as @manifestations" do
         get :index
-        assigns(:manifestations).should_not be_nil
+        expect(assigns(:manifestations)).to_not be_nil
       end
     end
 
@@ -26,7 +26,7 @@ describe ManifestationsController do
 
       it "assigns all manifestations as @manifestations" do
         get :index
-        assigns(:manifestations).should_not be_nil
+        expect(assigns(:manifestations)).to_not be_nil
       end
     end
 
@@ -35,137 +35,131 @@ describe ManifestationsController do
 
       it "assigns all manifestations as @manifestations" do
         get :index
-        assigns(:manifestations).should_not be_nil
+        expect(assigns(:manifestations)).to_not be_nil
       end
     end
 
     describe "When not logged in" do
       it "assigns all manifestations as @manifestations" do
         get :index
-        assigns(:manifestations).should_not be_nil
+        expect(assigns(:manifestations)).to_not be_nil
       end
 
       it "assigns all manifestations as @manifestations in xml format without operation" do
         get :index, :format => 'xml'
-        response.should be_success
-        assigns(:manifestations).should_not be_nil
+        expect(response).to be_success
+        expect(assigns(:manifestations)).to_not be_nil
       end
 
       it "assigns all manifestations as @manifestations in txt format without operation" do
         get :index, :format => 'txt'
-        response.should be_success
-        assigns(:manifestations).should_not be_nil
-        response.should render_template('manifestations/index')
+        expect(response).to be_success
+        expect(assigns(:manifestations)).to_not be_nil
+        expect(response).to render_template('manifestations/index')
       end
 
       it "assigns all manifestations as @manifestations in sru format without operation" do
         get :index, :format => 'sru'
         assert_response :success
-        assigns(:manifestations).should be_nil
-        response.should render_template('manifestations/explain')
+        expect(assigns(:manifestations)).to be_nil
+        expect(response).to render_template('manifestations/explain')
       end
 
       it "assigns all manifestations as @manifestations in sru format with operation" do
         get :index, :format => 'sru', :operation => 'searchRetrieve', :query => 'ruby'
-        assigns(:manifestations).should_not be_nil
-        response.should render_template('manifestations/index')
+        expect(assigns(:manifestations)).to_not be_nil
+        expect(response).to render_template('manifestations/index')
       end
 
       it "assigns all manifestations as @manifestations in sru format with operation and title" do
         get :index, :format => 'sru', :query => 'title=ruby', :operation => 'searchRetrieve'
-        assigns(:manifestations).should_not be_nil
-        response.should render_template('manifestations/index')
+        expect(assigns(:manifestations)).to_not be_nil
+        expect(response).to render_template('manifestations/index')
       end
 
       it "assigns all manifestations as @manifestations in openurl" do
         get :index, :api => 'openurl', :title => 'ruby'
-        assigns(:manifestations).should_not be_nil
+        expect(assigns(:manifestations)).to_not be_nil
       end
 
       it "assigns all manifestations as @manifestations when pub_date_from and pub_date_to are specified" do
         get :index, :pub_date_from => '2000', :pub_date_to => '2007'
         assigns(:query).should eq "date_of_publication_d:[#{Time.zone.parse('2000-01-01').utc.iso8601} TO #{Time.zone.parse('2007-12-31').end_of_year.utc.iso8601}]"
-        assigns(:manifestations).should_not be_nil
+        expect(assigns(:manifestations)).to_not be_nil
       end
 
       it "assigns all manifestations as @manifestations when acquired_from and pub_date_to are specified" do
         get :index, :acquired_from => '2000', :acquired_to => '2007'
         assigns(:query).should eq "acquired_at_d:[#{Time.zone.parse('2000-01-01').utc.iso8601} TO #{Time.zone.parse('2007-12-31').end_of_day.utc.iso8601}]"
-        assigns(:manifestations).should_not be_nil
+        expect(assigns(:manifestations)).to_not be_nil
       end
 
       it "assigns all manifestations as @manifestations when number_of_pages_at_least and number_of_pages_at_most are specified" do
         get :index, :number_of_pages_at_least => '100', :number_of_pages_at_least => '200'
-        assigns(:manifestations).should_not be_nil
+        expect(assigns(:manifestations)).to_not be_nil
       end
 
       it "assigns all manifestations as @manifestations in mods format" do
         get :index, :format => 'mods'
-        assigns(:manifestations).should_not be_nil
-        response.should render_template("manifestations/index")
+        expect(assigns(:manifestations)).to_not be_nil
+        expect(response).to render_template("manifestations/index")
       end
 
       it "assigns all manifestations as @manifestations in rdf format" do
         get :index, :format => 'rdf'
-        assigns(:manifestations).should_not be_nil
-        response.should render_template("manifestations/index")
+        expect(assigns(:manifestations)).to_not be_nil
+        expect(response).to render_template("manifestations/index")
       end
 
       it "should get index with manifestation_id" do
         get :index, :manifestation_id => 1
-        response.should be_success
-        assigns(:manifestation).should eq Manifestation.find(1)
+        expect(response).to be_success
+        expect(assigns(:manifestation)).to eq Manifestation.find(1)
         assigns(:manifestations).collect(&:id).should eq assigns(:manifestation).derived_manifestations.collect(&:id)
       end
 
-      it "should get index with publisher_id" do
-        get :index, :publisher_id => 1
-        response.should be_success
-        assigns(:manifestations).collect(&:id).should eq Agent.find(1).manifestations.order('created_at DESC').collect(&:id)
-      end
-
       it "should get index with query" do
         get :index, :query => '2005'
-        response.should be_success
-        assigns(:manifestations).should_not be_blank
+        expect(response).to be_success
+        expect(assigns(:manifestations)).to_not be_blank
       end
 
       it "should get index with page number" do
         get :index, :query => '2005', :number_of_pages_at_least => 1, :number_of_pages_at_most => 100
-        response.should be_success
+        expect(response).to be_success
         assigns(:query).should eq '2005 number_of_pages_i:[1 TO 100]'
       end
 
       it "should get index with pub_date_from" do
         get :index, :query => '2005', :pub_date_from => '2000'
-        response.should be_success
-        assigns(:manifestations).should be_truthy
+        expect(response).to be_success
+        expect(assigns(:manifestations)).to be_truthy
         assigns(:query).should eq '2005 date_of_publication_d:[1999-12-31T15:00:00Z TO *]'
       end
 
       it "should get index with pub_date_to" do
         get :index, :query => '2005', :pub_date_to => '2000'
-        response.should be_success
-        assigns(:manifestations).should be_truthy
+        expect(response).to be_success
+        expect(assigns(:manifestations)).to be_truthy
         assigns(:query).should eq '2005 date_of_publication_d:[* TO 2000-12-31T14:59:59Z]'
       end
 
       it "should get tag_cloud" do
         get :index, :query => '2005', :view => 'tag_cloud'
-        response.should be_success
-        response.should render_template("manifestations/_tag_cloud")
+        expect(response).to be_success
+        expect(response).to render_template("manifestations/_tag_cloud")
       end
 
       it "should show manifestation with isbn", :solr => true do
         get :index, :isbn => "4798002062"
-        response.should be_success
-        assigns(:manifestations).count.should eq 1
+        expect(response).to be_success
+        expect(assigns(:manifestations).count).to eq 1
       end
 
       it "should not show missing manifestation with isbn", :solr => true do
         get :index, :isbn => "47980020620"
-        response.should be_success
-        assigns(:manifestations).should be_empty
+        expect(response).to be_success
+        expect(assigns(:manifestations)).to be_empty
       end
     end
   end
@@ -176,7 +170,7 @@ describe ManifestationsController do
 
       it "assigns the requested manifestation as @manifestation" do
         get :show, :id => 1
-        assigns(:manifestation).should eq(Manifestation.find(1))
+        expect(assigns(:manifestation)).to eq(Manifestation.find(1))
       end
     end
 
@@ -185,13 +179,13 @@ describe ManifestationsController do
 
       it "assigns the requested manifestation as @manifestation" do
         get :show, :id => 1
-        assigns(:manifestation).should eq(Manifestation.find(1))
+        expect(assigns(:manifestation)).to eq(Manifestation.find(1))
       end
 
       it "should show manifestation with agent who does not produce it" do
         get :show, :id => 3, :agent_id => 3
-        assigns(:manifestation).should eq assigns(:agent).manifestations.find(3)
-        response.should be_success
+        expect(assigns(:manifestation)).to eq assigns(:agent).manifestations.find(3)
+        expect(response).to be_success
       end
     end
 
@@ -200,70 +194,70 @@ describe ManifestationsController do
 
       it "assigns the requested manifestation as @manifestation" do
         get :show, :id => 1
-        assigns(:manifestation).should eq(Manifestation.find(1))
+        expect(assigns(:manifestation)).to eq(Manifestation.find(1))
       end
 
       it "should send manifestation detail email" do
         get :show, :id => 1, :mode => 'send_email'
-        response.should redirect_to manifestation_url(assigns(:manifestation))
+        expect(response).to redirect_to manifestation_url(assigns(:manifestation))
       end
 
       #it "should show myself" do
       #  get :show, :id => users(:user1).agent
-      #  response.should be_success
+      #  expect(response).to be_success
       #end
     end
 
     describe "When not logged in" do
       it "assigns the requested manifestation as @manifestation" do
         get :show, :id => 1
-        assigns(:manifestation).should eq(Manifestation.find(1))
+        expect(assigns(:manifestation)).to eq(Manifestation.find(1))
       end
 
       it "guest should show manifestation mods template" do
         get :show, :id => 22, :format => 'mods'
-        assigns(:manifestation).should eq Manifestation.find(22)
-        response.should render_template("manifestations/show")
+        expect(assigns(:manifestation)).to eq Manifestation.find(22)
+        expect(response).to render_template("manifestations/show")
       end
 
       it "should show manifestation rdf template" do
         get :show, :id => 22, :format => 'rdf'
-        assigns(:manifestation).should eq Manifestation.find(22)
-        response.should render_template("manifestations/show")
+        expect(assigns(:manifestation)).to eq Manifestation.find(22)
+        expect(response).to render_template("manifestations/show")
       end
 
       it "should show manifestation with holding" do
         get :show, :id => 1, :mode => 'holding'
-        response.should be_success
+        expect(response).to be_success
       end
 
       it "should show manifestation with tag_edit" do
         get :show, :id => 1, :mode => 'tag_edit'
-        response.should render_template('manifestations/_tag_edit')
-        response.should be_success
+        expect(response).to render_template('manifestations/_tag_edit')
+        expect(response).to be_success
       end
 
       it "should show manifestation with tag_list" do
         get :show, :id => 1, :mode => 'tag_list'
-        response.should render_template('manifestations/_tag_list')
-        response.should be_success
+        expect(response).to render_template('manifestations/_tag_list')
+        expect(response).to be_success
       end
 
       it "should show manifestation with show_creators" do
         get :show, :id => 1, :mode => 'show_creators'
-        response.should render_template('manifestations/_show_creators')
-        response.should be_success
+        expect(response).to render_template('manifestations/_show_creators')
+        expect(response).to be_success
       end
 
       it "should show manifestation with show_all_creators" do
         get :show, :id => 1, :mode => 'show_all_creators'
-        response.should render_template('manifestations/_show_creators')
-        response.should be_success
+        expect(response).to render_template('manifestations/_show_creators')
+        expect(response).to be_success
       end
 
       it "should not send manifestation's detail email" do
         get :show, :id => 1, :mode => 'send_email'
-        response.should redirect_to new_user_session_url
+        expect(response).to redirect_to new_user_session_url
       end
     end
   end
@@ -274,17 +268,17 @@ describe ManifestationsController do
 
       it "assigns the requested manifestation as @manifestation" do
         get :new
-        assigns(:manifestation).should_not be_valid
+        expect(assigns(:manifestation)).to_not be_valid
       end
 
       it "should get new template without expression_id" do
         get :new
-        response.should be_success
+        expect(response).to be_success
       end
   
       it "should get new template with expression_id" do
         get :new, :expression_id => 1
-        response.should be_success
+        expect(response).to be_success
       end
     end
 
@@ -293,17 +287,17 @@ describe ManifestationsController do
 
       it "assigns the requested manifestation as @manifestation" do
         get :new
-        assigns(:manifestation).should_not be_valid
+        expect(assigns(:manifestation)).to_not be_valid
       end
 
       it "should get new template without expression_id" do
         get :new
-        response.should be_success
+        expect(response).to be_success
       end
   
       it "should get new template with expression_id" do
         get :new, :expression_id => 1
-        response.should be_success
+        expect(response).to be_success
       end
     end
 
@@ -312,16 +306,16 @@ describe ManifestationsController do
 
       it "should not assign the requested manifestation as @manifestation" do
         get :new
-        assigns(:manifestation).should_not be_valid
-        response.should be_forbidden
+        expect(assigns(:manifestation)).to_not be_valid
+        expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "should not assign the requested manifestation as @manifestation" do
         get :new
-        assigns(:manifestation).should_not be_valid
-        response.should redirect_to(new_user_session_url)
+        expect(assigns(:manifestation)).to_not be_valid
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
@@ -333,7 +327,7 @@ describe ManifestationsController do
       it "assigns the requested manifestation as @manifestation" do
         manifestation = FactoryGirl.create(:manifestation)
         get :edit, :id => manifestation.id
-        assigns(:manifestation).should eq(manifestation)
+        expect(assigns(:manifestation)).to eq(manifestation)
       end
     end
 
@@ -343,7 +337,7 @@ describe ManifestationsController do
       it "assigns the requested manifestation as @manifestation" do
         manifestation = FactoryGirl.create(:manifestation)
         get :edit, :id => manifestation.id
-        assigns(:manifestation).should eq(manifestation)
+        expect(assigns(:manifestation)).to eq(manifestation)
       end
     end
 
@@ -353,12 +347,12 @@ describe ManifestationsController do
       it "assigns the requested manifestation as @manifestation" do
         manifestation = FactoryGirl.create(:manifestation)
         get :edit, :id => manifestation.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
 
       it "should edit manifestation with tag_edit" do
         get :edit, :id => 1, :mode => 'tag_edit'
-        response.should be_success
+        expect(response).to be_success
       end
     end
 
@@ -366,7 +360,7 @@ describe ManifestationsController do
       it "should not assign the requested manifestation as @manifestation" do
         manifestation = FactoryGirl.create(:manifestation)
         get :edit, :id => manifestation.id
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
@@ -383,30 +377,30 @@ describe ManifestationsController do
       describe "with valid params" do
         it "assigns a newly created manifestation as @manifestation" do
           post :create, :manifestation => @attrs
-          assigns(:manifestation).should be_valid
+          expect(assigns(:manifestation)).to be_valid
         end
 
         it "assigns a series_statement" do
-          post :create, :manifestation => @attrs.merge(:series_statements_attributes => {[0] => {:original_title => SeriesStatement.find(1).original_title}})
+          post :create, :manifestation => @attrs.merge(:series_statements_attributes => {"0" => {:original_title => SeriesStatement.find(1).original_title}})
           assigns(:manifestation).reload
           assigns(:manifestation).series_statements.pluck(:original_title).include?(series_statements(:one).original_title).should be_truthy
         end
 
         it "redirects to the created manifestation" do
           post :create, :manifestation => @attrs
-          response.should redirect_to(manifestation_url(assigns(:manifestation)))
+          expect(response).to redirect_to(manifestation_url(assigns(:manifestation)))
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved manifestation as @manifestation" do
           post :create, :manifestation => @invalid_attrs
-          assigns(:manifestation).should_not be_valid
+          expect(assigns(:manifestation)).to_not be_valid
         end
 
         it "re-renders the 'new' template" do
           post :create, :manifestation => @invalid_attrs
-          response.should render_template("new")
+          expect(response).to render_template("new")
         end
       end
     end
@@ -417,24 +411,29 @@ describe ManifestationsController do
       describe "with valid params" do
         it "assigns a newly created manifestation as @manifestation" do
           post :create, :manifestation => @attrs
-          assigns(:manifestation).should be_valid
+          expect(assigns(:manifestation)).to be_valid
         end
 
         it "redirects to the created manifestation" do
           post :create, :manifestation => @attrs
-          response.should redirect_to(manifestation_url(assigns(:manifestation)))
+          expect(response).to redirect_to(manifestation_url(assigns(:manifestation)))
         end
+
+        #it "accepts an attachment file" do
+        #  post :create, :manifestation => @attrs.merge(attachment: fixture_file_upload("/../../examples/resource_import_file_sample1.tsv", 'text/csv'))
+        #  expect(assigns(:manifestation)).to be_valid
+        #end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved manifestation as @manifestation" do
           post :create, :manifestation => @invalid_attrs
-          assigns(:manifestation).should_not be_valid
+          expect(assigns(:manifestation)).to_not be_valid
         end
 
         it "re-renders the 'new' template" do
           post :create, :manifestation => @invalid_attrs
-          response.should render_template("new")
+          expect(response).to render_template("new")
         end
       end
     end
@@ -445,24 +444,24 @@ describe ManifestationsController do
       describe "with valid params" do
         it "assigns a newly created manifestation as @manifestation" do
           post :create, :manifestation => @attrs
-          assigns(:manifestation).should be_valid
+          expect(assigns(:manifestation)).to be_valid
         end
 
         it "should be forbidden" do
           post :create, :manifestation => @attrs
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved manifestation as @manifestation" do
           post :create, :manifestation => @invalid_attrs
-          assigns(:manifestation).should_not be_valid
+          expect(assigns(:manifestation)).to_not be_valid
         end
 
         it "should be forbidden" do
           post :create, :manifestation => @invalid_attrs
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
     end
@@ -471,24 +470,24 @@ describe ManifestationsController do
       describe "with valid params" do
         it "assigns a newly created manifestation as @manifestation" do
           post :create, :manifestation => @attrs
-          assigns(:manifestation).should be_valid
+          expect(assigns(:manifestation)).to be_valid
         end
 
         it "should be forbidden" do
           post :create, :manifestation => @attrs
-          response.should redirect_to(new_user_session_url)
+          expect(response).to redirect_to(new_user_session_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved manifestation as @manifestation" do
           post :create, :manifestation => @invalid_attrs
-          assigns(:manifestation).should_not be_valid
+          expect(assigns(:manifestation)).to_not be_valid
         end
 
         it "should be forbidden" do
           post :create, :manifestation => @invalid_attrs
-          response.should redirect_to(new_user_session_url)
+          expect(response).to redirect_to(new_user_session_url)
         end
       end
     end
@@ -511,21 +510,21 @@ describe ManifestationsController do
         end
 
         it "assigns a series_statement" do
-          put :update, :id => @manifestation.id, :manifestation => @attrs.merge(:series_statements_attributes => {[0] => {:original_title => series_statements(:two).original_title, "_destroy"=>"false"}})
+          put :update, :id => @manifestation.id, :manifestation => @attrs.merge(:series_statements_attributes => {"0" => {:original_title => series_statements(:two).original_title, "_destroy"=>"false"}})
           assigns(:manifestation).reload
           assigns(:manifestation).series_statements.pluck(:original_title).include?(series_statements(:two).original_title).should be_truthy
         end
 
         it "assigns the requested manifestation as @manifestation" do
           put :update, :id => @manifestation.id, :manifestation => @attrs
-          assigns(:manifestation).should eq(@manifestation)
+          expect(assigns(:manifestation)).to eq(@manifestation)
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested manifestation as @manifestation" do
           put :update, :id => @manifestation.id, :manifestation => @invalid_attrs
-          response.should render_template("edit")
+          expect(response).to render_template("edit")
         end
       end
     end
@@ -540,20 +539,20 @@ describe ManifestationsController do
 
         it "assigns the requested manifestation as @manifestation" do
           put :update, :id => @manifestation.id, :manifestation => @attrs
-          assigns(:manifestation).should eq(@manifestation)
-          response.should redirect_to(@manifestation)
+          expect(assigns(:manifestation)).to eq(@manifestation)
+          expect(response).to redirect_to(@manifestation)
         end
       end
 
       describe "with invalid params" do
         it "assigns the manifestation as @manifestation" do
           put :update, :id => @manifestation, :manifestation => @invalid_attrs
-          assigns(:manifestation).should_not be_valid
+          expect(assigns(:manifestation)).to_not be_valid
         end
 
         it "re-renders the 'edit' template" do
           put :update, :id => @manifestation, :manifestation => @invalid_attrs
-          response.should render_template("edit")
+          expect(response).to render_template("edit")
         end
       end
     end
@@ -568,15 +567,15 @@ describe ManifestationsController do
 
         it "assigns the requested manifestation as @manifestation" do
           put :update, :id => @manifestation.id, :manifestation => @attrs
-          assigns(:manifestation).should eq(@manifestation)
-          response.should be_forbidden
+          expect(assigns(:manifestation)).to eq(@manifestation)
+          expect(response).to be_forbidden
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested manifestation as @manifestation" do
           put :update, :id => @manifestation.id, :manifestation => @invalid_attrs
-          response.should be_forbidden
+          expect(response).to be_forbidden
         end
       end
     end
@@ -589,14 +588,14 @@ describe ManifestationsController do
 
         it "should be forbidden" do
           put :update, :id => @manifestation.id, :manifestation => @attrs
-          response.should redirect_to(new_user_session_url)
+          expect(response).to redirect_to(new_user_session_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested manifestation as @manifestation" do
           put :update, :id => @manifestation.id, :manifestation => @invalid_attrs
-          response.should redirect_to(new_user_session_url)
+          expect(response).to redirect_to(new_user_session_url)
         end
       end
     end
@@ -616,17 +615,17 @@ describe ManifestationsController do
 
       it "redirects to the manifestations list" do
         delete :destroy, :id => @manifestation.id
-        response.should redirect_to(manifestations_url)
+        expect(response).to redirect_to(manifestations_url)
       end
 
       it "should not destroy the reserved manifestation" do
         delete :destroy, :id => 2
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
 
       it "should not destroy manifestation contains items" do
         delete :destroy, :id => 1
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -639,7 +638,7 @@ describe ManifestationsController do
 
       it "should be forbidden" do
         delete :destroy, :id => @manifestation.id
-        response.should redirect_to(manifestations_url)
+        expect(response).to redirect_to(manifestations_url)
       end
     end
 
@@ -652,7 +651,7 @@ describe ManifestationsController do
 
       it "should be forbidden" do
         delete :destroy, :id => @manifestation.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -663,7 +662,7 @@ describe ManifestationsController do
 
       it "should be forbidden" do
         delete :destroy, :id => @manifestation.id
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end