Merge 48287a24d7 into 02d75ec729

spec/controllers/admin/rooms_controller_spec.rb

@@ -48,13 +48,9 @@ describe Admin::RoomsController do
     end
 
     describe 'POST #create' do
-      context 'saves successfuly' do
+      context 'saves successfuly', js: true do
         before do
-          post :create, room: attributes_for(:room), conference_id: conference.short_title
-        end
-
-        it 'redirects to admin room index path' do
-          expect(response).to redirect_to admin_conference_venue_rooms_path(conference_id: conference.short_title)
+          xhr :post, :create, room: attributes_for(:room), conference_id: conference.short_title
         end
 
         it 'shows success message in flash notice' do
@@ -69,11 +65,7 @@ describe Admin::RoomsController do
       context 'save fails' do
         before do
           allow_any_instance_of(Room).to receive(:save).and_return(false)
-          post :create, room: attributes_for(:room), conference_id: conference.short_title
-        end
-
-        it 'renders new template' do
-          expect(response).to render_template('new')
+          xhr :post, :create, room: attributes_for(:room), conference_id: conference.short_title
         end
 
         it 'shows error in flash message' do

spec/features/rooms_spec.rb

@@ -23,11 +23,9 @@ feature Room do
       click_button 'Create Room'
 
       # Validations
-      expect(flash).to eq('Room successfully created.')
-      within('table#rooms') do
-        expect(page.has_content?('Auditorium')).to be true
-        expect(page.assert_selector('tr', count: 2)).to be true
-      end
+      expect(page).to have_css '#messages', text: 'Room successfully created.'
+      expect(page).to have_css '#room_size', text: ''
+      expect(page).to have_css '#room_name', text: ''
     end
 
     scenario 'updates a room', feature: true, js: true do