enju_event 0.2.3 → 0.3.0.beta.1

data/spec/controllers/event_import_files_controller_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 
 describe EventImportFilesController do
@@ -47,7 +46,7 @@ describe EventImportFilesController do
       login_fixture_admin
 
       it "assigns the requested event_import_file as @event_import_file" do
-        get :show, :id => 1
+        get :show, params: { id: 1 }
         assigns(:event_import_file).should eq(EventImportFile.find(1))
       end
     end
@@ -56,7 +55,7 @@ describe EventImportFilesController do
       login_fixture_librarian
 
       it "assigns the requested event_import_file as @event_import_file" do
-        get :show, :id => 1
+        get :show, params: { id: 1 }
         assigns(:event_import_file).should eq(EventImportFile.find(1))
       end
     end
@@ -65,14 +64,14 @@ describe EventImportFilesController do
       login_fixture_user
 
       it "assigns the requested event_import_file as @event_import_file" do
-        get :show, :id => 1
+        get :show, params: { id: 1 }
         assigns(:event_import_file).should eq(EventImportFile.find(1))
       end
     end
 
     describe "When not logged in" do
       it "assigns the requested event_import_file as @event_import_file" do
-        get :show, :id => 1
+        get :show, params: { id: 1 }
         assigns(:event_import_file).should eq(EventImportFile.find(1))
         response.should redirect_to(new_user_session_url)
       end
@@ -124,7 +123,7 @@ describe EventImportFilesController do
       login_fixture_librarian
 
       it "should create event_import_file" do
-        post :create, :event_import_file => {:event_import => fixture_file_upload("/../../examples/event_import_file_sample1.tsv", 'text/csv') }
+        post :create, params: { event_import_file: {event_import: fixture_file_upload("/../../examples/event_import_file_sample1.tsv", 'text/csv') } }
         assigns(:event_import_file).should be_valid
         assigns(:event_import_file).user.username.should eq @user.username
         response.should redirect_to event_import_file_url(assigns(:event_import_file))
@@ -132,7 +131,7 @@ describe EventImportFilesController do
 
       it "should import user" do
         old_events_count = Event.count
-        post :create, :event_import_file => {:event_import => fixture_file_upload("/../../examples/event_import_file_sample2.tsv", 'text/csv'), :default_library_id => 3, :default_event_category_id => 3 }
+        post :create, params: { event_import_file: {event_import: fixture_file_upload("/../../examples/event_import_file_sample2.tsv", 'text/csv'), default_library_id: 3, default_event_category_id: 3 } }
         assigns(:event_import_file).import_start
         Event.count.should eq old_events_count + 2
         response.should redirect_to event_import_file_url(assigns(:event_import_file))
@@ -143,14 +142,14 @@ describe EventImportFilesController do
       login_fixture_user
 
       it "should be forbidden" do
-        post :create, :event_import_file => {:event_import => fixture_file_upload("/../..//examples/event_import_file_sample1.tsv", 'text/csv') }
+        post :create, params: { event_import_file: {event_import: fixture_file_upload("/../..//examples/event_import_file_sample1.tsv", 'text/csv') } }
         response.should be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "should be redirect to new session url" do
-        post :create, :event_import_file => {:event_import => fixture_file_upload("/../../examples/event_import_file_sample1.tsv", 'text/csv') }
+        post :create, params: { event_import_file: {event_import: fixture_file_upload("/../../examples/event_import_file_sample1.tsv", 'text/csv') } }
         response.should redirect_to new_user_session_url
       end
     end
@@ -162,7 +161,7 @@ describe EventImportFilesController do
 
       it "assigns the requested event_import_file as @event_import_file" do
         event_import_file = event_import_files(:event_import_file_00001)
-        get :edit, :id => event_import_file.id
+        get :edit, params: { id: event_import_file.id }
         assigns(:event_import_file).should eq(event_import_file)
       end
     end
@@ -172,7 +171,7 @@ describe EventImportFilesController do
 
       it "assigns the requested event_import_file as @event_import_file" do
         event_import_file = event_import_files(:event_import_file_00001)
-        get :edit, :id => event_import_file.id
+        get :edit, params: { id: event_import_file.id }
         assigns(:event_import_file).should eq(event_import_file)
       end
     end
@@ -182,7 +181,7 @@ describe EventImportFilesController do
 
       it "assigns the requested event_import_file as @event_import_file" do
         event_import_file = event_import_files(:event_import_file_00001)
-        get :edit, :id => event_import_file.id
+        get :edit, params: { id: event_import_file.id }
         response.should be_forbidden
       end
     end
@@ -190,7 +189,7 @@ describe EventImportFilesController do
     describe "When not logged in" do
       it "should not assign the requested event_import_file as @event_import_file" do
         event_import_file = event_import_files(:event_import_file_00001)
-        get :edit, :id => event_import_file.id
+        get :edit, params: { id: event_import_file.id }
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -201,7 +200,7 @@ describe EventImportFilesController do
       login_fixture_librarian
 
       it "should update event_import_file" do
-        put :update, :id => event_import_files(:event_import_file_00003).id, :event_import_file => { edit_mode: 'update' }
+        put :update, params: { id: event_import_files(:event_import_file_00003).id, event_import_file: { edit_mode: 'update' } }
         response.should redirect_to event_import_file_url(assigns(:event_import_file))
       end
     end
@@ -210,14 +209,14 @@ describe EventImportFilesController do
       login_fixture_user
 
       it "should not update event_import_file" do
-        put :update, :id => event_import_files(:event_import_file_00003).id, :event_import_file => { }
+        put :update, params: { id: event_import_files(:event_import_file_00003).id, event_import_file: { } }
         response.should be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "should not update event_import_file" do
-        put :update, :id => event_import_files(:event_import_file_00003).id, :event_import_file => { }
+        put :update, params: { id: event_import_files(:event_import_file_00003).id, event_import_file: { } }
         response.should redirect_to new_user_session_url
       end
     end
@@ -232,11 +231,11 @@ describe EventImportFilesController do
       login_fixture_admin
 
       it "destroys the requested event_import_file" do
-        delete :destroy, :id => @event_import_file.id
+        delete :destroy, params: { id: @event_import_file.id }
       end
 
       it "redirects to the event_import_files list" do
-        delete :destroy, :id => @event_import_file.id
+        delete :destroy, params: { id: @event_import_file.id }
         response.should redirect_to(event_import_files_url)
       end
     end
@@ -245,11 +244,11 @@ describe EventImportFilesController do
       login_fixture_librarian
 
       it "destroys the requested event_import_file" do
-        delete :destroy, :id => @event_import_file.id
+        delete :destroy, params: { id: @event_import_file.id }
       end
 
       it "redirects to the event_import_files list" do
-        delete :destroy, :id => @event_import_file.id
+        delete :destroy, params: { id: @event_import_file.id }
         response.should redirect_to(event_import_files_url)
       end
     end
@@ -258,22 +257,22 @@ describe EventImportFilesController do
       login_fixture_user
 
       it "destroys the requested event_import_file" do
-        delete :destroy, :id => @event_import_file.id
+        delete :destroy, params: { id: @event_import_file.id }
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @event_import_file.id
+        delete :destroy, params: { id: @event_import_file.id }
         response.should be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "destroys the requested event_import_file" do
-        delete :destroy, :id => @event_import_file.id
+        delete :destroy, params: { id: @event_import_file.id }
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @event_import_file.id
+        delete :destroy, params: { id: @event_import_file.id }
         response.should redirect_to(new_user_session_url)
       end
     end

data/spec/controllers/event_import_results_controller_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 
 describe EventImportResultsController do
@@ -47,7 +46,7 @@ describe EventImportResultsController do
       login_fixture_admin
 
       it "assigns the requested event_import_result as @event_import_result" do
-        get :show, :id => 1
+        get :show, params: { id: 1 }
         assigns(:event_import_result).should eq(EventImportResult.find(1))
       end
     end
@@ -56,7 +55,7 @@ describe EventImportResultsController do
       login_fixture_librarian
 
       it "assigns the requested event_import_result as @event_import_result" do
-        get :show, :id => 1
+        get :show, params: { id: 1 }
         assigns(:event_import_result).should eq(EventImportResult.find(1))
       end
     end
@@ -65,14 +64,14 @@ describe EventImportResultsController do
       login_fixture_user
 
       it "assigns the requested event_import_result as @event_import_result" do
-        get :show, :id => 1
+        get :show, params: { id: 1 }
         assigns(:event_import_result).should eq(EventImportResult.find(1))
       end
     end
 
     describe "When not logged in" do
       it "assigns the requested event_import_result as @event_import_result" do
-        get :show, :id => 1
+        get :show, params: { id: 1 }
         assigns(:event_import_result).should eq(EventImportResult.find(1))
         response.should redirect_to(new_user_session_url)
       end

data/spec/controllers/events_controller_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 describe EventsController do
   fixtures :all
 
-  describe "GET index", :solr => true do
+  describe "GET index", solr: true do
     before do
       Event.reindex
     end
@@ -46,51 +46,58 @@ describe EventsController do
       end
 
       it "assigns all events as @events in rss format" do
-        get :index, :format => 'rss'
+        get :index, format: 'rss'
         assigns(:events).should_not be_nil
       end
 
       it "assigns all events as @events in ics format" do
-        get :index, :format => 'ics'
+        get :index, format: 'ics'
         assigns(:events).should_not be_nil
       end
 
       it "assigns all events as @events in txt format" do
-        get :index, :format => 'txt'
+        get :index, format: 'txt'
         assigns(:events).should_not be_nil
       end
 
       it "should get index with library_id" do
-        get :index, :library_id => 'kamata'
+        get :index, params: { library_id: 'kamata' }
         response.should be_success
         assigns(:library).should eq libraries(:library_00002)
         assigns(:events).should_not be_nil
       end
 
       it "should get upcoming event index" do
-        get :index, :mode => 'upcoming'
+        get :index, params: { mode: 'upcoming' }
         response.should be_success
         assigns(:events).should_not be_nil
       end
 
       it "should get past event index" do
-        get :index, :mode => 'past'
+        get :index, params: { mode: 'past' }
         response.should be_success
         assigns(:events).should_not be_nil
       end
 
       describe "with json data (calendar feed)" do
+        render_views
         it "should get all events data" do
           20.times do |c|
             FactoryBot.create(:event)
           end
           Event.reindex
           today = Date.today
-          get :index, { format: "json", start: today.beginning_of_month.to_s, end: today.end_of_month.to_s }
+          get :index, params: { format: "json", start: today.beginning_of_month.to_s, end: today.end_of_month.to_s }
           expect(response).to be_success
           events = assigns(:events)
           expect(events).not_to be_nil
           expect(events.size).to be >= 20
+          expect(response.body).to match /\A\[/
+          data = JSON.parse(response.body)
+          p data.first
+          expect(data.first).not_to be_nil
+          expect(data.first).to have_key("start")
+          expect(data.first).to have_key("url")
         end
       end
     end
@@ -102,7 +109,7 @@ describe EventsController do
 
       it "assigns the requested event as @event" do
         event = FactoryBot.create(:event)
-        get :show, :id => event.id
+        get :show, params: { id: event.id }
         assigns(:event).should eq(event)
       end
     end
@@ -112,7 +119,7 @@ describe EventsController do
 
       it "assigns the requested event as @event" do
         event = FactoryBot.create(:event)
-        get :show, :id => event.id
+        get :show, params: { id: event.id }
         assigns(:event).should eq(event)
       end
     end
@@ -122,7 +129,7 @@ describe EventsController do
 
       it "assigns the requested event as @event" do
         event = FactoryBot.create(:event)
-        get :show, :id => event.id
+        get :show, params: { id: event.id }
         assigns(:event).should eq(event)
       end
     end
@@ -130,7 +137,7 @@ describe EventsController do
     describe "When not logged in" do
       it "assigns the requested event as @event" do
         event = FactoryBot.create(:event)
-        get :show, :id => event.id
+        get :show, params: { id: event.id }
         assigns(:event).should eq(event)
       end
     end
@@ -180,7 +187,7 @@ describe EventsController do
 
       it "assigns the requested event as @event" do
         event = FactoryBot.create(:event)
-        get :edit, :id => event.id
+        get :edit, params: { id: event.id }
         assigns(:event).should eq(event)
       end
     end
@@ -190,7 +197,7 @@ describe EventsController do
 
       it "assigns the requested event as @event" do
         event = FactoryBot.create(:event)
-        get :edit, :id => event.id
+        get :edit, params: { id: event.id }
       end
     end
 
@@ -199,7 +206,7 @@ describe EventsController do
 
       it "assigns the requested event as @event" do
         event = FactoryBot.create(:event)
-        get :edit, :id => event.id
+        get :edit, params: { id: event.id }
         response.should be_forbidden
       end
     end
@@ -207,7 +214,7 @@ describe EventsController do
     describe "When not logged in" do
       it "should not assign the requested event as @event" do
         event = FactoryBot.create(:event)
-        get :edit, :id => event.id
+        get :edit, params: { id: event.id }
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -216,7 +223,7 @@ describe EventsController do
   describe "POST create" do
     before(:each) do
       @attrs = FactoryBot.attributes_for(:event)
-      @invalid_attrs = {:name => ''}
+      @invalid_attrs = {name: ''}
     end
 
     describe "When logged in as Administrator" do
@@ -224,24 +231,24 @@ describe EventsController do
 
       describe "with valid params" do
         it "assigns a newly created event as @event" do
-          post :create, :event => @attrs
+          post :create, params: { event: @attrs }
           assigns(:event).should be_valid
         end
 
         it "redirects to the created event" do
-          post :create, :event => @attrs
+          post :create, params: { event: @attrs }
           response.should redirect_to(assigns(:event))
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved event as @event" do
-          post :create, :event => @invalid_attrs
+          post :create, params: { event: @invalid_attrs }
           assigns(:event).should_not be_valid
         end
 
         it "should be forbidden" do
-          post :create, :event => @invalid_attrs
+          post :create, params: { event: @invalid_attrs }
           response.should render_template("new")
         end
       end
@@ -252,24 +259,24 @@ describe EventsController do
 
       describe "with valid params" do
         it "assigns a newly created event as @event" do
-          post :create, :event => @attrs
+          post :create, params: { event: @attrs }
           assigns(:event).should be_valid
         end
 
         it "redirects to the created event" do
-          post :create, :event => @attrs
+          post :create, params: { event: @attrs }
           response.should redirect_to(assigns(:event))
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved event as @event" do
-          post :create, :event => @invalid_attrs
+          post :create, params: { event: @invalid_attrs }
           assigns(:event).should_not be_valid
         end
 
         it "should be forbidden" do
-          post :create, :event => @invalid_attrs
+          post :create, params: { event: @invalid_attrs }
           response.should render_template("new")
         end
       end
@@ -280,24 +287,24 @@ describe EventsController do
 
       describe "with valid params" do
         it "assigns a newly created event as @event" do
-          post :create, :event => @attrs
+          post :create, params: { event: @attrs }
           assigns(:event).should be_nil
         end
 
         it "should be forbidden" do
-          post :create, :event => @attrs
+          post :create, params: { event: @attrs }
           response.should be_forbidden
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved event as @event" do
-          post :create, :event => @invalid_attrs
+          post :create, params: { event: @invalid_attrs }
           assigns(:event).should be_nil
         end
 
         it "should be forbidden" do
-          post :create, :event => @invalid_attrs
+          post :create, params: { event: @invalid_attrs }
           response.should be_forbidden
         end
       end
@@ -306,24 +313,24 @@ describe EventsController do
     describe "When not logged in" do
       describe "with valid params" do
         it "assigns a newly created event as @event" do
-          post :create, :event => @attrs
+          post :create, params: { event: @attrs }
           assigns(:event).should be_nil
         end
 
         it "should be forbidden" do
-          post :create, :event => @attrs
+          post :create, params: { event: @attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved event as @event" do
-          post :create, :event => @invalid_attrs
+          post :create, params: { event: @invalid_attrs }
           assigns(:event).should be_nil
         end
 
         it "should be forbidden" do
-          post :create, :event => @invalid_attrs
+          post :create, params: { event: @invalid_attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
@@ -334,7 +341,7 @@ describe EventsController do
     before(:each) do
       @event = FactoryBot.create(:event)
       @attrs = FactoryBot.attributes_for(:event)
-      @invalid_attrs = {:name => ''}
+      @invalid_attrs = {name: ''}
     end
 
     describe "When logged in as Administrator" do
@@ -342,18 +349,18 @@ describe EventsController do
 
       describe "with valid params" do
         it "updates the requested event" do
-          put :update, :id => @event.id, :event => @attrs
+          put :update, params: { id: @event.id, event: @attrs }
         end
 
         it "assigns the requested event as @event" do
-          put :update, :id => @event.id, :event => @attrs
+          put :update, params: { id: @event.id, event: @attrs }
           assigns(:event).should eq(@event)
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested event as @event" do
-          put :update, :id => @event.id, :event => @invalid_attrs
+          put :update, params: { id: @event.id, event: @invalid_attrs }
           response.should render_template("edit")
         end
       end
@@ -364,18 +371,18 @@ describe EventsController do
 
       describe "with valid params" do
         it "updates the requested event" do
-          put :update, :id => @event.id, :event => @attrs
+          put :update, params: { id: @event.id, event: @attrs }
         end
 
         it "assigns the requested event as @event" do
-          put :update, :id => @event.id, :event => @attrs
+          put :update, params: { id: @event.id, event: @attrs }
           assigns(:event).should eq(@event)
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested event as @event" do
-          put :update, :id => @event.id, :event => @invalid_attrs
+          put :update, params: { id: @event.id, event: @invalid_attrs }
           response.should render_template("edit")
         end
       end
@@ -386,11 +393,11 @@ describe EventsController do
 
       describe "with valid params" do
         it "updates the requested event" do
-          put :update, :id => @event.id, :event => @attrs
+          put :update, params: { id: @event.id, event: @attrs }
         end
 
         it "assigns the requested event as @event" do
-          put :update, :id => @event.id, :event => @attrs
+          put :update, params: { id: @event.id, event: @attrs }
           assigns(:event).should eq(@event)
           response.should be_forbidden
         end
@@ -398,7 +405,7 @@ describe EventsController do
 
       describe "with invalid params" do
         it "assigns the requested event as @event" do
-          put :update, :id => @event.id, :event => @invalid_attrs
+          put :update, params: { id: @event.id, event: @invalid_attrs }
           response.should be_forbidden
         end
       end
@@ -407,18 +414,18 @@ describe EventsController do
     describe "When not logged in" do
       describe "with valid params" do
         it "updates the requested event" do
-          put :update, :id => @event.id, :event => @attrs
+          put :update, params: { id: @event.id, event: @attrs }
         end
 
         it "should be forbidden" do
-          put :update, :id => @event.id, :event => @attrs
+          put :update, params: { id: @event.id, event: @attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested event as @event" do
-          put :update, :id => @event.id, :event => @invalid_attrs
+          put :update, params: { id: @event.id, event: @invalid_attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
@@ -434,11 +441,11 @@ describe EventsController do
       login_fixture_admin
 
       it "destroys the requested event" do
-        delete :destroy, :id => @event.id
+        delete :destroy, params: { id: @event.id }
       end
 
       it "redirects to the events list" do
-        delete :destroy, :id => @event.id
+        delete :destroy, params: { id: @event.id }
         response.should redirect_to(events_url)
       end
     end
@@ -447,11 +454,11 @@ describe EventsController do
       login_fixture_librarian
 
       it "destroys the requested event" do
-        delete :destroy, :id => @event.id
+        delete :destroy, params: { id: @event.id }
       end
 
       it "redirects to the events list" do
-        delete :destroy, :id => @event.id
+        delete :destroy, params: { id: @event.id }
         response.should redirect_to(events_url)
       end
     end
@@ -460,22 +467,22 @@ describe EventsController do
       login_fixture_user
 
       it "destroys the requested event" do
-        delete :destroy, :id => @event.id
+        delete :destroy, params: { id: @event.id }
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @event.id
+        delete :destroy, params: { id: @event.id }
         response.should be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "destroys the requested event" do
-        delete :destroy, :id => @event.id
+        delete :destroy, params: { id: @event.id }
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @event.id
+        delete :destroy, params: { id: @event.id }
         response.should redirect_to(new_user_session_url)
       end
     end