Merge 22e0c1d8f8 into 05209260a4

spec/views/admin/events/index.html.haml_spec.rb

@@ -38,4 +38,19 @@ describe 'admin/events/index' do
     expect(rendered).to have_selector('table tr:nth-of-type(2) td:nth-of-type(2)', text: 'event2')
     expect(rendered).to have_selector('table tr:nth-of-type(2) td:nth-of-type(5)', text: 'German')
   end
+
+  it 'has the Add Event link with a new event path' do
+    assign(:conference, conference)
+    assign(:program, conference.program)
+    program.languages = 'en,de'
+    assign(:events, [ event1, event2 ])
+    assign(:event_types, [ create(:event_type, program: conference.program), create(:event_type, program: conference.program) ])
+    assign(:tracks, [ create(:track, program: conference.program), create(:track, program: conference.program) ])
+    assign(:difficulty_levels, [ create(:difficulty_level, program: conference.program), create(:difficulty_level, program: conference.program) ])
+
+    render
+
+    expect(rendered).to have_link('Add Event', href: new_admin_conference_program_event_path(conference.short_title))
+  end
+
 end

spec/views/admin/events/new.html.haml_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe 'admin/conferences/events/new' do
+  it 'renders the new event template' do
+    @conference = create(:conference)
+    @user = create(:user)
+    @program = @conference.program
+    @event = build(:event, program: @conference.program)
+    @event_type = create(:event_type, program: @program)
+    @url = admin_conference_program_events_path(@conference.short_title, @event)
+    @users = User.all
+    render template: 'admin/events/_form.html.haml'
+    expect(rendered).to include('New Event')
+  end
+end