enju_biblio 0.1.3 → 0.2.0.beta.1

data/spec/cassette_library/ResourceImportFile/when_its_mode_is_create_/when_it_is_written_in_utf-8/should_send_message_when_import_is_completed.yml

@@ -19,28 +19,28 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Sat, 26 Dec 2015 04:36:50 GMT
+      - Fri, 08 Jan 2016 17:45:33 GMT
       X-Ua-Compatible:
       - IE=Edge,chrome=1
-      Etag:
-      - '"2050ced6e3b9988f998ff109f46ce7a6"'
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Runtime:
-      - '0.125028'
+      - '0.135450'
+      Etag:
+      - '"e9227be71e70e054723f00e5ae1bfe19"'
       Status:
       - '200'
       Content-Type:
       - application/xml; charset=utf-8
       Set-Cookie:
-      - ROUTEID=.ps17; path=/
-      - TS01cb7804=011338590a03b2ddb47f2209aa5505e72033fce8715f6c029b78fc5e96145004633c8ad33e995ed0bc4ffdbb7f64a6dc4ebc8f7b5e;
+      - ROUTEID=.ps19; path=/
+      - TS01cb7804=011338590a4ea8503e00b2d26067b59ec3d7c84beb9e7f5e5b13841dcf28f4a20faa98a1033717b1074f773bec0d8e4fd7c6703825;
         path=/; domain=.iss.ndl.go.jp
-      - TS01f3cfdf=011338590aa6923b3648a5a1079cc7de9f6f1a2f64836dc2403b9423789293f0e4e2c95b20f7b4d08c3b6440b06493e402846e0c2813ae4e4c0d193ce228182a649ae0c3beef766aeec624799730a21749b518b48b;
+      - TS01f3cfdf=011338590a9644b85415f6899de8fe2891b7751b9cf1333eb49958c02cb7a1f5567a9aa614aae37cae2addbf26e2c2099573cbde18723b71cb021256263fc4907311de290934cef7f90ec417c8d1c461c3d42350b7;
         Path=/
-      - _front_session_id=5e1b76da2b13156c2adab004f587fe40; domain=.iss.ndl.go.jp;
-        path=/; expires=Sat, 26-Dec-2015 05:36:50 GMT; HttpOnly
-      - ndl.go.jp=rd2o00000000000000000000ffff0a024f6co80; path=/
+      - _front_session_id=80d6344c6e18477b93a11e1966b52625; domain=.iss.ndl.go.jp;
+        path=/; expires=Fri, 08-Jan-2016 18:45:33 GMT; HttpOnly
+      - ndl.go.jp=rd2o00000000000000000000ffff0a024f69o80; path=/
       - serverid=1101; path=/
       Vary:
       - Accept-Encoding,User-Agent
@@ -49,29 +49,29 @@ http_interactions:
       X-Frame-Options:
       - SAMEORIGIN
       Content-Length:
-      - '1474'
+      - '1471'
       Connection:
       - close
     body:
       encoding: ASCII-8BIT
       string: !binary |-
         PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHJzcyB4
-        bWxuczpkY21pdHlwZT0iaHR0cDovL3B1cmwub3JnL2RjL2RjbWl0eXBlLyIg
-        eG1sbnM6ZGNuZGw9Imh0dHA6Ly9uZGwuZ28uanAvZGNuZGwvdGVybXMvIiB4
-        bWxuczp4c2k9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hLWlu
-        c3RhbmNlIiB4bWxuczpyZGZzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzAx
-        L3JkZi1zY2hlbWEjIiB2ZXJzaW9uPSIyLjAiIHhtbG5zOmRjPSJodHRwOi8v
-        cHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cmRmPSJodHRwOi8v
-        d3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIiB4bWxuczpv
-        cGVuU2VhcmNoPSJodHRwOi8vYTkuY29tLy0vc3BlYy9vcGVuc2VhcmNocnNz
-        LzEuMC8iIHhtbG5zOmRjdGVybXM9Imh0dHA6Ly9wdXJsLm9yZy9kYy90ZXJt
-        cy8iPgogIDxjaGFubmVsPgogICAgPHRpdGxlPjEgOTc4NDc5ODAwMjA2NCBp
+        bWxuczpkY25kbD0iaHR0cDovL25kbC5nby5qcC9kY25kbC90ZXJtcy8iIHht
+        bG5zOmRjbWl0eXBlPSJodHRwOi8vcHVybC5vcmcvZGMvZGNtaXR5cGUvIiB4
+        bWxuczpvcGVuU2VhcmNoPSJodHRwOi8vYTkuY29tLy0vc3BlYy9vcGVuc2Vh
+        cmNocnNzLzEuMC8iIHhtbG5zOmRjdGVybXM9Imh0dHA6Ly9wdXJsLm9yZy9k
+        Yy90ZXJtcy8iIHhtbG5zOnJkZnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAv
+        MDEvcmRmLXNjaGVtYSMiIHZlcnNpb249IjIuMCIgeG1sbnM6eHNpPSJodHRw
+        Oi8vd3d3LnczLm9yZy8yMDAxL1hNTFNjaGVtYS1pbnN0YW5jZSIgeG1sbnM6
+        ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIiB4bWxuczpy
+        ZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1u
+        cyMiPgogIDxjaGFubmVsPgogICAgPHRpdGxlPjEgOTc4NDc5ODAwMjA2NCBp
         c3MtbmRsLW9wYWMgLSDlm73nq4vlm73kvJrlm7Pmm7jppKjjgrXjg7zjg4Eg
         T3BlblNlYXJjaDwvdGl0bGU+CiAgICA8bGluaz5odHRwOi8vaXNzLm5kbC5n
         by5qcC9hcGkvb3BlbnNlYXJjaD9jbnQ9MTAmYW1wO2lzYm49OTc4NDc5ODAw
         MjA2NCZhbXA7bWVkaWF0eXBlPTEmYW1wO2RwaWQ9aXNzLW5kbC1vcGFjJmFt
         cDtpZHg9MTwvbGluaz4KICAgIDxkZXNjcmlwdGlvbj5TZWFyY2ggcmVzdWx0
-        cyBmb3IgZHBpZD1pc3MtbmRsLW9wYWMgbWVkaWF0eXBlPTEgY250PTEwIGlz
+        cyBmb3IgY250PTEwIG1lZGlhdHlwZT0xIGRwaWQ9aXNzLW5kbC1vcGFjIGlz
         Ym49OTc4NDc5ODAwMjA2NCA8L2Rlc2NyaXB0aW9uPgogICAgPGxhbmd1YWdl
         PmphPC9sYW5ndWFnZT4KICAgIDxvcGVuU2VhcmNoOnRvdGFsUmVzdWx0cz4x
         PC9vcGVuU2VhcmNoOnRvdGFsUmVzdWx0cz4KICAgIDxvcGVuU2VhcmNoOnN0
@@ -143,7 +143,7 @@ http_interactions:
         aW5qL29wYWMvc3dpdGNoLWRldGFpbC1pY2NhcC5kbz9iaWJpZD0xMTAwMDM3
         MTk5Ii8+CiAgICA8L2l0ZW0+CiAgPC9jaGFubmVsPgo8L3Jzcz4K
     http_version: 
-  recorded_at: Sat, 26 Dec 2015 04:36:50 GMT
+  recorded_at: Fri, 08 Jan 2016 17:45:33 GMT
 - request:
     method: get
     uri: http://iss.ndl.go.jp/books/R100000002-I000003046546-00.rdf
@@ -163,28 +163,28 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Sat, 26 Dec 2015 04:36:50 GMT
-      X-Runtime:
-      - '0.601626'
+      - Fri, 08 Jan 2016 17:45:33 GMT
       X-Ua-Compatible:
       - IE=Edge,chrome=1
+      X-Runtime:
+      - '0.479124'
+      Etag:
+      - '"eeb316b1b0b2f10369a1915db57a3b22"'
       Cache-Control:
       - max-age=0, private, must-revalidate
-      Etag:
-      - '"62ffd79d069e985fb24f06418251e071"'
       Status:
       - '200'
       Content-Type:
       - application/rdf+xml; charset=utf-8
       Set-Cookie:
-      - ROUTEID=.ps24; path=/
-      - TS01cb7804=011338590a6471359dfd12ded9fa516794fc7e451721cf83ee35351ce0497f389d66ff2bc603806837e5575b9f1a337a631b7a4258;
+      - ROUTEID=.ps20; path=/
+      - TS01cb7804=011338590a16d9f867e775b52a3e0914d4a1274666bb608a38eedc375717b3029d1d4dd01d9725e4e1cd0627bdc30d0dfbf209d018;
         path=/; domain=.iss.ndl.go.jp
-      - TS01f3cfdf=011338590a24639f177d63b0bb155c5ac3dfd93e975ec5fcc610a3f06a2b430e1d2ad52802b5ac3e123e7434bdc07870b2427a0ffa6f0771c1c69ec0c0ee8ccf1a39a29a055f43afcc9e7da8734a37ab0b5bfb96b1;
+      - TS01f3cfdf=011338590a7e70e2ea37dbd5c1b1781f06b9a66e481e95dbc497cad900240af5660a953effe7298021320c7bf83e39c0b93790ed47822c8329e63425ae6c183cc722b60e77245777d746509d1f4f00d7233ad69ee6;
         Path=/
-      - _front_session_id=5efe2d6ed4151dffcd522062f26eb81e; domain=.iss.ndl.go.jp;
-        path=/; expires=Sat, 26-Dec-2015 05:36:50 GMT; HttpOnly
-      - ndl.go.jp=rd2o00000000000000000000ffff0a024f69o80; path=/
+      - _front_session_id=cc4e951ff262eee52fabc2bd7eebf414; domain=.iss.ndl.go.jp;
+        path=/; expires=Fri, 08-Jan-2016 18:45:33 GMT; HttpOnly
+      - ndl.go.jp=rd2o00000000000000000000ffff0a024f68o80; path=/
       - serverid=1101; path=/
       Vary:
       - Accept-Encoding,User-Agent
@@ -201,13 +201,13 @@ http_interactions:
       string: !binary |-
         PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHJkZjpS
         REYgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEv
-        IiB4bWxuczpkY25kbD0iaHR0cDovL25kbC5nby5qcC9kY25kbC90ZXJtcy8i
-        IHhtbG5zOm93bD0iaHR0cDovL3d3dy53My5vcmcvMjAwMi8wNy9vd2wjIiB4
-        bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5
-        bnRheC1ucyMiIHhtbG5zOnJkZnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAv
-        MDEvcmRmLXNjaGVtYSMiIHhtbG5zOmRjdGVybXM9Imh0dHA6Ly9wdXJsLm9y
-        Zy9kYy90ZXJtcy8iIHhtbG5zOmZvYWY9Imh0dHA6Ly94bWxucy5jb20vZm9h
-        Zi8wLjEvIj4KICA8ZGNuZGw6QmliQWRtaW5SZXNvdXJjZSByZGY6YWJvdXQ9
+        IiB4bWxuczpkY3Rlcm1zPSJodHRwOi8vcHVybC5vcmcvZGMvdGVybXMvIiB4
+        bWxuczpmb2FmPSJodHRwOi8veG1sbnMuY29tL2ZvYWYvMC4xLyIgeG1sbnM6
+        cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgt
+        bnMjIiB4bWxuczpyZGZzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzAxL3Jk
+        Zi1zY2hlbWEjIiB4bWxuczpkY25kbD0iaHR0cDovL25kbC5nby5qcC9kY25k
+        bC90ZXJtcy8iIHhtbG5zOm93bD0iaHR0cDovL3d3dy53My5vcmcvMjAwMi8w
+        Ny9vd2wjIj4KICA8ZGNuZGw6QmliQWRtaW5SZXNvdXJjZSByZGY6YWJvdXQ9
         Imh0dHA6Ly9pc3MubmRsLmdvLmpwL2Jvb2tzL1IxMDAwMDAwMDItSTAwMDAw
         MzA0NjU0Ni0wMCI+CiAgICA8ZGNuZGw6Y2F0YWxvZ2luZ1N0YXR1cz5DNzwv
         ZGNuZGw6Y2F0YWxvZ2luZ1N0YXR1cz4KICAgIDxkY25kbDpiaWJSZWNvcmRD
@@ -508,5 +508,5 @@ http_interactions:
         ruWgtOaJgCA6IO+8ou+8kuabuOW6q++8rTwvZGN0ZXJtczpkZXNjcmlwdGlv
         bj4KICA8L2RjbmRsOkl0ZW0+CjwvcmRmOlJERj4=
     http_version: 
-  recorded_at: Sat, 26 Dec 2015 04:36:50 GMT
+  recorded_at: Fri, 08 Jan 2016 17:45:33 GMT
 recorded_with: VCR 3.0.1

data/spec/controllers/agent_import_files_controller_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe AgentImportFilesController do
   fixtures :all
@@ -28,7 +28,7 @@ describe AgentImportFilesController do
 
       it "assigns empty as @agent_import_files" do
         get :index
-        expect(assigns(:agent_import_files)).to be_empty
+        expect(assigns(:agent_import_files)).to be_nil
         expect(response).to be_forbidden
       end
     end
@@ -36,7 +36,7 @@ describe AgentImportFilesController do
     describe "When not logged in" do
       it "assigns empty as @agent_import_files" do
         get :index
-        expect(assigns(:agent_import_files)).to be_empty
+        expect(assigns(:agent_import_files)).to be_nil
         expect(response).to redirect_to(new_user_session_url)
       end
     end
@@ -105,7 +105,7 @@ describe AgentImportFilesController do
 
       it "should not assign the requested agent_import_file as @agent_import_file" do
         get :new
-        expect(assigns(:agent_import_file)).to_not be_valid
+        expect(assigns(:agent_import_file)).to be_nil
         expect(response).to be_forbidden
       end
     end
@@ -113,7 +113,7 @@ describe AgentImportFilesController do
     describe "When not logged in" do
       it "should not assign the requested agent_import_file as @agent_import_file" do
         get :new
-        expect(assigns(:agent_import_file)).to_not be_valid
+        expect(assigns(:agent_import_file)).to be_nil
         expect(response).to redirect_to(new_user_session_url)
       end
     end

data/spec/controllers/agent_import_results_controller_spec.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe AgentImportResultsController do
   fixtures :all
@@ -28,7 +28,7 @@ describe AgentImportResultsController do
 
       it "assigns empty as @agent_import_results" do
         get :index
-        expect(assigns(:agent_import_results)).to be_empty
+        expect(assigns(:agent_import_results)).to be_nil
         expect(response).to be_forbidden
       end
     end
@@ -36,7 +36,7 @@ describe AgentImportResultsController do
     describe "When not logged in" do
       it "assigns empty as @agent_import_results" do
         get :index
-        expect(assigns(:agent_import_results)).to be_empty
+        expect(assigns(:agent_import_results)).to be_nil
         expect(response).to redirect_to(new_user_session_url)
       end
     end

data/spec/controllers/agent_merge_lists_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'sunspot/rails/spec_helper'
 
 describe AgentMergeListsController do
@@ -29,14 +29,14 @@ describe AgentMergeListsController do
 
       it "assigns empty as @agent_merge_lists" do
         get :index
-        assigns(:agent_merge_lists).should be_empty
+        assigns(:agent_merge_lists).should be_nil
       end
     end
 
     describe "When not logged in" do
       it "assigns empty as @agent_merge_lists" do
         get :index
-        assigns(:agent_merge_lists).should be_empty
+        assigns(:agent_merge_lists).should be_nil
       end
     end
   end
@@ -109,7 +109,7 @@ describe AgentMergeListsController do
 
       it "should not assign the requested agent_merge_list as @agent_merge_list" do
         get :new
-        assigns(:agent_merge_list).should_not be_valid
+        assigns(:agent_merge_list).should be_nil
         response.should be_forbidden
       end
     end
@@ -117,7 +117,7 @@ describe AgentMergeListsController do
     describe "When not logged in" do
       it "should not assign the requested agent_merge_list as @agent_merge_list" do
         get :new
-        assigns(:agent_merge_list).should_not be_valid
+        assigns(:agent_merge_list).should be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -231,7 +231,7 @@ describe AgentMergeListsController do
       describe "with valid params" do
         it "assigns a newly created agent_merge_list as @agent_merge_list" do
           post :create, :agent_merge_list => @attrs
-          assigns(:agent_merge_list).should be_valid
+          assigns(:agent_merge_list).should be_nil
         end
 
         it "should be forbidden" do
@@ -243,7 +243,7 @@ describe AgentMergeListsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved agent_merge_list as @agent_merge_list" do
           post :create, :agent_merge_list => @invalid_attrs
-          assigns(:agent_merge_list).should_not be_valid
+          assigns(:agent_merge_list).should be_nil
         end
 
         it "should be forbidden" do
@@ -257,7 +257,7 @@ describe AgentMergeListsController do
       describe "with valid params" do
         it "assigns a newly created agent_merge_list as @agent_merge_list" do
           post :create, :agent_merge_list => @attrs
-          assigns(:agent_merge_list).should be_valid
+          assigns(:agent_merge_list).should be_nil
         end
 
         it "should be forbidden" do
@@ -269,7 +269,7 @@ describe AgentMergeListsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved agent_merge_list as @agent_merge_list" do
           post :create, :agent_merge_list => @invalid_attrs
-          assigns(:agent_merge_list).should_not be_valid
+          assigns(:agent_merge_list).should be_nil
         end
 
         it "should be forbidden" do

data/spec/controllers/agent_merges_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe AgentMergesController do
   fixtures :all
@@ -31,7 +31,7 @@ describe AgentMergesController do
 
       it "should be forbidden" do
         get :index
-        assigns(:agent_merges).should be_empty
+        assigns(:agent_merges).should be_nil
         response.should be_forbidden
       end
     end
@@ -39,7 +39,7 @@ describe AgentMergesController do
     describe "When not logged in" do
       it "should be forbidden" do
         get :index
-        assigns(:agent_merges).should be_empty
+        assigns(:agent_merges).should be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -111,7 +111,7 @@ describe AgentMergesController do
 
       it "should not assign the requested agent_merge as @agent_merge" do
         get :new
-        assigns(:agent_merge).should_not be_valid
+        assigns(:agent_merge).should be_nil
         response.should be_forbidden
       end
     end
@@ -119,7 +119,7 @@ describe AgentMergesController do
     describe "When not logged in" do
       it "should not assign the requested agent_merge as @agent_merge" do
         get :new
-        assigns(:agent_merge).should_not be_valid
+        assigns(:agent_merge).should be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -233,7 +233,7 @@ describe AgentMergesController do
       describe "with valid params" do
         it "assigns a newly created agent_merge as @agent_merge" do
           post :create, :agent_merge => @attrs
-          assigns(:agent_merge).should be_valid
+          assigns(:agent_merge).should be_nil
         end
 
         it "should be forbidden" do
@@ -245,7 +245,7 @@ describe AgentMergesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved agent_merge as @agent_merge" do
           post :create, :agent_merge => @invalid_attrs
-          assigns(:agent_merge).should_not be_valid
+          assigns(:agent_merge).should be_nil
         end
 
         it "should be forbidden" do
@@ -259,7 +259,7 @@ describe AgentMergesController do
       describe "with valid params" do
         it "assigns a newly created agent_merge as @agent_merge" do
           post :create, :agent_merge => @attrs
-          assigns(:agent_merge).should be_valid
+          assigns(:agent_merge).should be_nil
         end
 
         it "should be forbidden" do
@@ -271,7 +271,7 @@ describe AgentMergesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved agent_merge as @agent_merge" do
           post :create, :agent_merge => @invalid_attrs
-          assigns(:agent_merge).should_not be_valid
+          assigns(:agent_merge).should be_nil
         end
 
         it "should be forbidden" do

data/spec/controllers/agent_relationship_types_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'sunspot/rails/spec_helper'
 
 describe AgentRelationshipTypesController do
@@ -19,7 +19,7 @@ describe AgentRelationshipTypesController do
 
       it "assigns all agent_relationship_types as @agent_relationship_types" do
         get :index
-        expect(assigns(:agent_relationship_types)).to eq(AgentRelationshipType.all)
+        expect(assigns(:agent_relationship_types)).to eq(AgentRelationshipType.order(:position))
       end
     end
 
@@ -28,7 +28,7 @@ describe AgentRelationshipTypesController do
 
       it "assigns all agent_relationship_types as @agent_relationship_types" do
         get :index
-        expect(assigns(:agent_relationship_types)).to eq(AgentRelationshipType.all)
+        expect(assigns(:agent_relationship_types)).to eq(AgentRelationshipType.order(:position))
       end
     end
 
@@ -37,14 +37,14 @@ describe AgentRelationshipTypesController do
 
       it "assigns all agent_relationship_types as @agent_relationship_types" do
         get :index
-        expect(assigns(:agent_relationship_types)).to eq(AgentRelationshipType.all)
+        expect(assigns(:agent_relationship_types)).to eq(AgentRelationshipType.order(:position))
       end
     end
 
     describe "When not logged in" do
       it "assigns all agent_relationship_types as @agent_relationship_types" do
         get :index
-        expect(assigns(:agent_relationship_types)).to eq(AgentRelationshipType.all)
+        expect(assigns(:agent_relationship_types)).to eq(AgentRelationshipType.order(:position))
       end
     end
   end
@@ -105,7 +105,7 @@ describe AgentRelationshipTypesController do
 
       it "should not assign the requested agent_relationship_type as @agent_relationship_type" do
         get :new
-        expect(assigns(:agent_relationship_type)).not_to be_valid
+        expect(assigns(:agent_relationship_type)).to be_nil
         expect(response).to be_forbidden
       end
     end
@@ -115,7 +115,7 @@ describe AgentRelationshipTypesController do
 
       it "should not assign the requested agent_relationship_type as @agent_relationship_type" do
         get :new
-        expect(assigns(:agent_relationship_type)).not_to be_valid
+        expect(assigns(:agent_relationship_type)).to be_nil
         expect(response).to be_forbidden
       end
     end
@@ -123,7 +123,7 @@ describe AgentRelationshipTypesController do
     describe "When not logged in" do
       it "should not assign the requested agent_relationship_type as @agent_relationship_type" do
         get :new
-        expect(assigns(:agent_relationship_type)).not_to be_valid
+        expect(assigns(:agent_relationship_type)).to be_nil
         expect(response).to redirect_to(new_user_session_url)
       end
     end
@@ -209,7 +209,7 @@ describe AgentRelationshipTypesController do
       describe "with valid params" do
         it "assigns a newly created agent_relationship_type as @agent_relationship_type" do
           post :create, :agent_relationship_type => @attrs
-          expect(assigns(:agent_relationship_type)).to be_valid
+          expect(assigns(:agent_relationship_type)).to be_nil
         end
 
         it "should be forbidden" do
@@ -221,7 +221,7 @@ describe AgentRelationshipTypesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved agent_relationship_type as @agent_relationship_type" do
           post :create, :agent_relationship_type => @invalid_attrs
-          expect(assigns(:agent_relationship_type)).not_to be_valid
+          expect(assigns(:agent_relationship_type)).to be_nil
         end
 
         it "should be forbidden" do
@@ -237,7 +237,7 @@ describe AgentRelationshipTypesController do
       describe "with valid params" do
         it "assigns a newly created agent_relationship_type as @agent_relationship_type" do
           post :create, :agent_relationship_type => @attrs
-          expect(assigns(:agent_relationship_type)).to be_valid
+          expect(assigns(:agent_relationship_type)).to be_nil
         end
 
         it "should be forbidden" do
@@ -249,7 +249,7 @@ describe AgentRelationshipTypesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved agent_relationship_type as @agent_relationship_type" do
           post :create, :agent_relationship_type => @invalid_attrs
-          expect(assigns(:agent_relationship_type)).not_to be_valid
+          expect(assigns(:agent_relationship_type)).to be_nil
         end
 
         it "should be forbidden" do
@@ -263,7 +263,7 @@ describe AgentRelationshipTypesController do
       describe "with valid params" do
         it "assigns a newly created agent_relationship_type as @agent_relationship_type" do
           post :create, :agent_relationship_type => @attrs
-          expect(assigns(:agent_relationship_type)).to be_valid
+          expect(assigns(:agent_relationship_type)).to be_nil
         end
 
         it "should be forbidden" do
@@ -275,7 +275,7 @@ describe AgentRelationshipTypesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved agent_relationship_type as @agent_relationship_type" do
           post :create, :agent_relationship_type => @invalid_attrs
-          expect(assigns(:agent_relationship_type)).not_to be_valid
+          expect(assigns(:agent_relationship_type)).to be_nil
         end
 
         it "should be forbidden" do

data/spec/controllers/agent_relationships_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'sunspot/rails/spec_helper'
 
 describe AgentRelationshipsController do
@@ -95,7 +95,7 @@ describe AgentRelationshipsController do
 
       it "assigns the requested agent_relationship as @agent_relationship" do
         get :new
-        expect(assigns(:agent_relationship)).not_to be_valid
+        expect(assigns(:agent_relationship)).to be_nil
         expect(response).to redirect_to agents_url
       end
     end
@@ -105,7 +105,7 @@ describe AgentRelationshipsController do
 
       it "should not assign the requested agent_relationship as @agent_relationship" do
         get :new
-        expect(assigns(:agent_relationship)).not_to be_valid
+        expect(assigns(:agent_relationship)).to be_nil
         expect(response).to redirect_to agents_url
       end
     end
@@ -115,7 +115,7 @@ describe AgentRelationshipsController do
 
       it "should not assign the requested agent_relationship as @agent_relationship" do
         get :new
-        expect(assigns(:agent_relationship)).not_to be_valid
+        expect(assigns(:agent_relationship)).to be_nil
         expect(response).to be_forbidden
       end
     end
@@ -123,7 +123,7 @@ describe AgentRelationshipsController do
     describe "When not logged in" do
       it "should not assign the requested agent_relationship as @agent_relationship" do
         get :new
-        expect(assigns(:agent_relationship)).not_to be_valid
+        expect(assigns(:agent_relationship)).to be_nil
         expect(response).to redirect_to(new_user_session_url)
       end
     end
@@ -237,7 +237,7 @@ describe AgentRelationshipsController do
       describe "with valid params" do
         it "assigns a newly created agent_relationship as @agent_relationship" do
           post :create, :agent_relationship => @attrs
-          expect(assigns(:agent_relationship)).to be_valid
+          expect(assigns(:agent_relationship)).to be_nil
         end
 
         it "should be forbidden" do
@@ -249,7 +249,7 @@ describe AgentRelationshipsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved agent_relationship as @agent_relationship" do
           post :create, :agent_relationship => @invalid_attrs
-          expect(assigns(:agent_relationship)).not_to be_valid
+          expect(assigns(:agent_relationship)).to be_nil
         end
 
         it "should be forbidden" do
@@ -263,7 +263,7 @@ describe AgentRelationshipsController do
       describe "with valid params" do
         it "assigns a newly created agent_relationship as @agent_relationship" do
           post :create, :agent_relationship => @attrs
-          expect(assigns(:agent_relationship)).to be_valid
+          expect(assigns(:agent_relationship)).to be_nil
         end
 
         it "should be forbidden" do
@@ -275,7 +275,7 @@ describe AgentRelationshipsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved agent_relationship as @agent_relationship" do
           post :create, :agent_relationship => @invalid_attrs
-          expect(assigns(:agent_relationship)).not_to be_valid
+          expect(assigns(:agent_relationship)).to be_nil
         end
 
         it "should be forbidden" do

data/spec/controllers/agent_types_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 # This spec was generated by rspec-rails when you ran the scaffold generator.
 # It demonstrates how one might use RSpec to specify the controller code that
@@ -33,7 +33,7 @@ describe AgentTypesController do
     it "assigns all agent_types as @agent_types" do
       agent_type = AgentType.create! valid_attributes
       get :index
-      expect(assigns(:agent_types)).to eq(AgentType.all)
+      expect(assigns(:agent_types)).to eq(AgentType.order(:position))
     end
   end
 

data/spec/controllers/agents_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe AgentsController do
   fixtures :all
@@ -117,7 +117,7 @@ describe AgentsController do
       #  expect(response).to be_success
       #end
 
-      #it "should show_ atron when required_role is librarian" do
+      #it "should show patron when required_role is librarian" do
       #  get :show, :id => users(:user1).agent.id
       #  expect(assigns(:agent)).to eq(users(:user1).agent)
       #  expect(response).to be_success
@@ -212,7 +212,7 @@ describe AgentsController do
 
       it "should not assign the requested agent as @agent" do
         get :new
-        expect(assigns(:agent)).not_to be_valid
+        expect(assigns(:agent)).to be_nil
         expect(response).to be_forbidden
       end
     end
@@ -220,7 +220,7 @@ describe AgentsController do
     describe "When not logged in" do
       it "should not assign the requested agent as @agent" do
         get :new
-        expect(assigns(:agent)).not_to be_valid
+        expect(assigns(:agent)).to be_nil
         expect(response).to redirect_to(new_user_session_url)
       end
     end
@@ -383,7 +383,7 @@ describe AgentsController do
       describe "with valid params" do
         it "assigns a newly created agent as @agent" do
           post :create, :agent => @attrs
-          expect(assigns(:agent)).to be_valid
+          expect(assigns(:agent)).to be_nil
         end
 
         it "should be forbidden" do
@@ -395,7 +395,7 @@ describe AgentsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved agent as @agent" do
           post :create, :agent => @invalid_attrs
-          expect(assigns(:agent)).not_to be_valid
+          expect(assigns(:agent)).to be_nil
         end
 
         it "should be forbidden" do
@@ -420,7 +420,7 @@ describe AgentsController do
       describe "with valid params" do
         it "assigns a newly created agent as @agent" do
           post :create, :agent => @attrs
-          expect(assigns(:agent)).to be_valid
+          expect(assigns(:agent)).to be_nil
         end
 
         it "should be forbidden" do
@@ -432,7 +432,7 @@ describe AgentsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved agent as @agent" do
           post :create, :agent => @invalid_attrs
-          expect(assigns(:agent)).not_to be_valid
+          expect(assigns(:agent)).to be_nil
         end
 
         it "should be forbidden" do

data/spec/controllers/carrier_types_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 # This spec was generated by rspec-rails when you ran the scaffold generator.
 # It demonstrates how one might use RSpec to specify the controller code that

data/spec/controllers/content_types_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 # This spec was generated by rspec-rails when you ran the scaffold generator.
 # It demonstrates how one might use RSpec to specify the controller code that