enju_biblio 0.1.0.pre56 → 0.1.0.pre57

data/spec/controllers/resource_import_files_controller_spec.rb

@@ -9,7 +9,7 @@ describe ResourceImportFilesController do
 
       it "assigns all resource_import_files as @resource_import_files" do
         get :index
-        assigns(:resource_import_files).should eq(ResourceImportFile.page(1))
+        expect(assigns(:resource_import_files)).to eq(ResourceImportFile.page(1))
       end
     end
 
@@ -18,7 +18,7 @@ describe ResourceImportFilesController do
 
       it "assigns all resource_import_files as @resource_import_files" do
         get :index
-        assigns(:resource_import_files).should eq(ResourceImportFile.page(1))
+        expect(assigns(:resource_import_files)).to eq(ResourceImportFile.page(1))
       end
     end
 
@@ -27,16 +27,16 @@ describe ResourceImportFilesController do
 
       it "assigns empty as @resource_import_files" do
         get :index
-        assigns(:resource_import_files).should be_empty
-        response.should be_forbidden
+        expect(assigns(:resource_import_files)).to be_empty
+        expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "assigns empty as @resource_import_files" do
         get :index
-        assigns(:resource_import_files).should be_empty
-        response.should redirect_to(new_user_session_url)
+        expect(assigns(:resource_import_files)).to be_empty
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
@@ -47,8 +47,8 @@ describe ResourceImportFilesController do
 
       it "assigns the requested resource_import_file as @resource_import_file" do
         get :show, :id => resource_import_files(:resource_import_file_00003).id
-        assigns(:resource_import_file).should eq(resource_import_files(:resource_import_file_00003))
-        response.should be_success
+        expect(assigns(:resource_import_file)).to eq(resource_import_files(:resource_import_file_00003))
+        expect(response).to be_success
       end
     end
 
@@ -57,8 +57,8 @@ describe ResourceImportFilesController do
 
       it "assigns the requested resource_import_file as @resource_import_file" do
         get :show, :id => resource_import_files(:resource_import_file_00003).id
-        assigns(:resource_import_file).should eq(resource_import_files(:resource_import_file_00003))
-        response.should be_success
+        expect(assigns(:resource_import_file)).to eq(resource_import_files(:resource_import_file_00003))
+        expect(response).to be_success
       end
     end
 
@@ -67,16 +67,16 @@ describe ResourceImportFilesController do
 
       it "assigns the requested resource_import_file as @resource_import_file" do
         get :show, :id => resource_import_files(:resource_import_file_00003).id
-        assigns(:resource_import_file).should eq(resource_import_files(:resource_import_file_00003))
-        response.should be_forbidden
+        expect(assigns(:resource_import_file)).to eq(resource_import_files(:resource_import_file_00003))
+        expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "assigns the requested resource_import_file as @resource_import_file" do
         get :show, :id => resource_import_files(:resource_import_file_00003).id
-        assigns(:resource_import_file).should eq(resource_import_files(:resource_import_file_00003))
-        response.should redirect_to(new_user_session_url)
+        expect(assigns(:resource_import_file)).to eq(resource_import_files(:resource_import_file_00003))
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
@@ -87,8 +87,8 @@ describe ResourceImportFilesController do
 
       it "assigns the requested resource_import_file as @resource_import_file" do
         get :new
-        assigns(:resource_import_file).should_not be_valid
-        response.should be_success
+        expect(assigns(:resource_import_file)).not_to be_valid
+        expect(response).to be_success
       end
     end
 
@@ -97,8 +97,8 @@ describe ResourceImportFilesController do
 
       it "should not assign the requested resource_import_file as @resource_import_file" do
         get :new
-        assigns(:resource_import_file).should_not be_valid
-        response.should be_success
+        expect(assigns(:resource_import_file)).not_to be_valid
+        expect(response).to be_success
       end
     end
 
@@ -107,16 +107,16 @@ describe ResourceImportFilesController do
 
       it "should not assign the requested resource_import_file as @resource_import_file" do
         get :new
-        assigns(:resource_import_file).should_not be_valid
-        response.should be_forbidden
+        expect(assigns(:resource_import_file)).not_to be_valid
+        expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "should not assign the requested resource_import_file as @resource_import_file" do
         get :new
-        assigns(:resource_import_file).should_not be_valid
-        response.should redirect_to(new_user_session_url)
+        expect(assigns(:resource_import_file)).not_to be_valid
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
@@ -130,9 +130,9 @@ describe ResourceImportFilesController do
 
       it "should create agent_import_file" do
         post :create, :resource_import_file => {:resource_import => fixture_file_upload("/../../examples/resource_import_file_sample1.tsv", 'text/csv') }
-        assigns(:resource_import_file).should be_valid
+        expect(assigns(:resource_import_file)).to be_valid
         assigns(:resource_import_file).user.username.should eq @user.username
-        response.should redirect_to resource_import_file_url(assigns(:resource_import_file))
+        expect(response).to redirect_to resource_import_file_url(assigns(:resource_import_file))
       end
     end
 
@@ -145,7 +145,7 @@ describe ResourceImportFilesController do
       it "should be forbidden" do
         post :create, :resource_import_file => {:resource_import => fixture_file_upload("/../../examples/resource_import_file_sample1.tsv", 'text/csv') }
         assigns(:resource_import_file).user.should be_nil
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -153,7 +153,7 @@ describe ResourceImportFilesController do
       it "should be redirected to new session url" do
         post :create, :resource_import_file => {:resource_import => fixture_file_upload("/../../examples/resource_import_file_sample1.tsv", 'text/csv') }
         assigns(:resource_import_file).user.should be_nil
-        response.should redirect_to new_user_session_url
+        expect(response).to redirect_to new_user_session_url
       end
     end
   end
@@ -165,7 +165,7 @@ describe ResourceImportFilesController do
       it "assigns the requested resource_import_file as @resource_import_file" do
         resource_import_file = resource_import_files(:resource_import_file_00001)
         get :edit, :id => resource_import_file.id
-        assigns(:resource_import_file).should eq(resource_import_file)
+        expect(assigns(:resource_import_file)).to eq(resource_import_file)
       end
     end
 
@@ -175,7 +175,7 @@ describe ResourceImportFilesController do
       it "assigns the requested resource_import_file as @resource_import_file" do
         resource_import_file = resource_import_files(:resource_import_file_00001)
         get :edit, :id => resource_import_file.id
-        assigns(:resource_import_file).should eq(resource_import_file)
+        expect(assigns(:resource_import_file)).to eq(resource_import_file)
       end
     end
 
@@ -185,7 +185,7 @@ describe ResourceImportFilesController do
       it "assigns the requested resource_import_file as @resource_import_file" do
         resource_import_file = resource_import_files(:resource_import_file_00001)
         get :edit, :id => resource_import_file.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -193,7 +193,7 @@ describe ResourceImportFilesController do
       it "should not assign the requested resource_import_file as @resource_import_file" do
         resource_import_file = resource_import_files(:resource_import_file_00001)
         get :edit, :id => resource_import_file.id
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
@@ -204,7 +204,7 @@ describe ResourceImportFilesController do
 
       it "should update resource_import_file" do
         put :update, :id => resource_import_files(:resource_import_file_00003).id, :resource_import_file => { }
-        response.should redirect_to resource_import_file_url(assigns(:resource_import_file))
+        expect(response).to redirect_to resource_import_file_url(assigns(:resource_import_file))
       end
     end
 
@@ -213,7 +213,7 @@ describe ResourceImportFilesController do
 
       it "should update resource_import_file" do
         put :update, :id => resource_import_files(:resource_import_file_00003).id, :resource_import_file => { }
-        response.should redirect_to resource_import_file_url(assigns(:resource_import_file))
+        expect(response).to redirect_to resource_import_file_url(assigns(:resource_import_file))
       end
     end
 
@@ -222,14 +222,14 @@ describe ResourceImportFilesController do
 
       it "should not update resource_import_file" do
         put :update, :id => resource_import_files(:resource_import_file_00003).id, :resource_import_file => { }
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "should not update resource_import_file" do
         put :update, :id => resource_import_files(:resource_import_file_00003).id, :resource_import_file => { }
-        response.should redirect_to new_user_session_url
+        expect(response).to redirect_to new_user_session_url
       end
     end
   end
@@ -248,7 +248,7 @@ describe ResourceImportFilesController do
 
       it "redirects to the resource_import_files list" do
         delete :destroy, :id => @resource_import_file.id
-        response.should redirect_to(resource_import_files_url)
+        expect(response).to redirect_to(resource_import_files_url)
       end
     end
 
@@ -261,7 +261,7 @@ describe ResourceImportFilesController do
 
       it "redirects to the resource_import_files list" do
         delete :destroy, :id => @resource_import_file.id
-        response.should redirect_to(resource_import_files_url)
+        expect(response).to redirect_to(resource_import_files_url)
       end
     end
 
@@ -274,7 +274,7 @@ describe ResourceImportFilesController do
 
       it "should be forbidden" do
         delete :destroy, :id => @resource_import_file.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -285,7 +285,7 @@ describe ResourceImportFilesController do
 
       it "should be forbidden" do
         delete :destroy, :id => @resource_import_file.id
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end

data/spec/controllers/resource_import_results_controller_spec.rb

@@ -10,7 +10,7 @@ describe ResourceImportResultsController do
 
       it "assigns all resource_import_results as @resource_import_results" do
         get :index
-        assigns(:resource_import_results).should eq(ResourceImportResult.page(1))
+        expect(assigns(:resource_import_results)).to eq(ResourceImportResult.page(1))
       end
     end
 
@@ -19,7 +19,7 @@ describe ResourceImportResultsController do
 
       it "assigns all resource_import_results as @resource_import_results" do
         get :index
-        assigns(:resource_import_results).should eq(ResourceImportResult.page(1))
+        expect(assigns(:resource_import_results)).to eq(ResourceImportResult.page(1))
       end
     end
 
@@ -28,16 +28,16 @@ describe ResourceImportResultsController do
 
       it "assigns empty as @resource_import_results" do
         get :index
-        assigns(:resource_import_results).should be_empty
-        response.should be_forbidden
+        expect(assigns(:resource_import_results)).to be_empty
+        expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "assigns empty as @resource_import_results" do
         get :index
-        assigns(:resource_import_results).should be_empty
-        response.should redirect_to(new_user_session_url)
+        expect(assigns(:resource_import_results)).to be_empty
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
@@ -48,7 +48,7 @@ describe ResourceImportResultsController do
 
       it "assigns the requested resource_import_result as @resource_import_result" do
         get :show, :id => 1
-        assigns(:resource_import_result).should eq(ResourceImportResult.find(1))
+        expect(assigns(:resource_import_result)).to eq(ResourceImportResult.find(1))
       end
     end
 
@@ -57,7 +57,7 @@ describe ResourceImportResultsController do
 
       it "assigns the requested resource_import_result as @resource_import_result" do
         get :show, :id => 1
-        assigns(:resource_import_result).should eq(ResourceImportResult.find(1))
+        expect(assigns(:resource_import_result)).to eq(ResourceImportResult.find(1))
       end
     end
 
@@ -66,15 +66,15 @@ describe ResourceImportResultsController do
 
       it "assigns the requested resource_import_result as @resource_import_result" do
         get :show, :id => 1
-        assigns(:resource_import_result).should eq(ResourceImportResult.find(1))
+        expect(assigns(:resource_import_result)).to eq(ResourceImportResult.find(1))
       end
     end
 
     describe "When not logged in" do
       it "assigns the requested resource_import_result as @resource_import_result" do
         get :show, :id => 1
-        assigns(:resource_import_result).should eq(ResourceImportResult.find(1))
-        response.should redirect_to(new_user_session_url)
+        expect(assigns(:resource_import_result)).to eq(ResourceImportResult.find(1))
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
@@ -93,7 +93,7 @@ describe ResourceImportResultsController do
 
       it "should be forbidden" do
         delete :destroy, :id => @resource_import_result.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -106,7 +106,7 @@ describe ResourceImportResultsController do
 
       it "should be forbidden" do
         delete :destroy, :id => @resource_import_result.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -119,7 +119,7 @@ describe ResourceImportResultsController do
 
       it "should be forbidden" do
         delete :destroy, :id => @resource_import_result.id
-        response.should be_forbidden
+        expect(response).to be_forbidden
       end
     end
 
@@ -130,7 +130,7 @@ describe ResourceImportResultsController do
 
       it "should be forbidden" do
         delete :destroy, :id => @resource_import_result.id
-        response.should redirect_to(new_user_session_url)
+        expect(response).to redirect_to(new_user_session_url)
       end
     end
   end