diff --git a/app/views/admin/events/index.html.haml b/app/views/admin/events/index.html.haml
index 6b608947..0c0d9d75 100644
--- a/app/views/admin/events/index.html.haml
+++ b/app/views/admin/events/index.html.haml
@@ -108,32 +108,32 @@
- if event.transition_possible? :accept
%li= link_to 'Accept event (no email)',
update_state_admin_conference_event_path(@conference.short_title, event, transition: :accept, send_mail: false),
- method: :patch, hint: 'Accept this event without sending an automated email.'
+ method: :patch, hint: 'Accept this event without sending an automated email.', id: 'accept_event'
%li= link_to 'Accept event (WITH email)',
update_state_admin_conference_event_path(@conference.short_title, event, transition: :accept, send_mail: true),
- method: :patch, hint: 'Accept this event and send an automated email.'
+ method: :patch, hint: 'Accept this event and send an automated email.', id: 'accept_event_mail'
- if event.transition_possible? :reject
%li= link_to 'Reject event (no email)',
update_state_admin_conference_event_path(@conference.short_title, event, transition: :reject, send_mail: false),
method: :patch, confirm: 'Are you sure?',
- hint: 'Reject this event without sending an automated email.'
+ hint: 'Reject this event without sending an automated email.', id: 'reject_event'
%li= link_to 'Reject event (WITH email)',
update_state_admin_conference_event_path(@conference.short_title, event, transition: :reject, send_mail: true),
method: :patch, confirm: 'Are you sure?',
- hint: 'Reject this event and send an automated email.'
+ hint: 'Reject this event and send an automated email.', id: 'reject_event_mail'
- if event.transition_possible? :start_review
%li= link_to 'Start review',
update_state_admin_conference_event_path(@conference.short_title, event, transition: :start_review),
- method: :patch
+ method: :patch, id: 'review_event'
- if event.transition_possible? :confirm
%li= link_to 'Confirm event',
update_state_admin_conference_event_path(@conference.short_title, event, transition: :confirm),
- method: :patch,
+ method: :patch, id: 'confirm_event',
hint: 'Confirm that the speaker(s) will be present and that the event will actually take place.'
- if event.transition_possible? :cancel
%li= link_to 'Cancel event',
update_state_admin_conference_event_path(@conference.short_title, event, :transition => :cancel),
- method: :patch,
+ method: :patch, id: 'cancel_event',
hint: 'Mark this event as cancelled. Usually this means that the speakers had to cancel their appearance.'
:javascript
diff --git a/app/views/conference_registration/register.html.haml b/app/views/conference_registration/register.html.haml
index df55dcc1..13b6b568 100644
--- a/app/views/conference_registration/register.html.haml
+++ b/app/views/conference_registration/register.html.haml
@@ -1,6 +1,6 @@
.row
.col-md-12
- = semantic_form_for(@registration, :url => register_conference_path(@conference.short_title), :html => { :method => :put }) do |f|
+ = semantic_form_for(@registration, :url => register_conference_path(@conference.short_title), :html => { :method => :patch }) do |f|
.tabbable
%ul.nav.nav-tabs
%li.active
@@ -19,4 +19,4 @@
= link_to "Unregister", register_conference_path(@conference.short_title),:method => :delete, :class => "btn btn-danger",
:confirm => "Are you sure you want to unregister?"
- else
- = f.action :submit, :button_html => { :value => "Register", :class => "btn btn-primary" }
+ = f.action :submit, :button_html => { :value => "Register", :class => "btn btn-primary", id: 'register' }
diff --git a/app/views/proposal/index.html.haml b/app/views/proposal/index.html.haml
index 3d820f50..0edf1c8c 100644
--- a/app/views/proposal/index.html.haml
+++ b/app/views/proposal/index.html.haml
@@ -29,7 +29,10 @@
.pull-right
- if event.transition_possible? :confirm
= link_to 'Confirm',
- conference_proposal_confirm_path(@conference.short_title, event, send_mail: false), method: :patch, class: 'btn btn-mini btn-success'
- = link_to 'Edit', edit_conference_proposal_path(@conference.short_title, event.id), class: 'btn btn-mini btn-primary'
+ conference_proposal_confirm_path(@conference.short_title, event, send_mail: false),
+ method: :patch, class: 'btn btn-mini btn-success', id: 'confirm_proposal'
+ = link_to 'Edit', edit_conference_proposal_path(@conference.short_title, event.id),
+ class: 'btn btn-mini btn-primary', id: 'edit_proposal'
= link_to 'Withdraw', conference_proposal_path(@conference.short_title, event.id), method: :delete,
- confirm: 'Are you sure you want to withdraw this proposal?', class: 'btn btn-mini btn-danger'
+ confirm: 'Are you sure you want to withdraw this proposal?', class: 'btn btn-mini btn-danger',
+ id: 'delete_proposal'
diff --git a/spec/factories/email_settings.rb b/spec/factories/email_settings.rb
new file mode 100644
index 00000000..e7cd0f76
--- /dev/null
+++ b/spec/factories/email_settings.rb
@@ -0,0 +1,10 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+ factory :email_settings do
+ send_on_registration false
+ send_on_accepted false
+ send_on_rejected false
+ send_on_confirmed_without_registration false
+ end
+end
diff --git a/spec/features/proposal_spec.rb b/spec/features/proposal_spec.rb
index 5d032dd0..30ae3883 100644
--- a/spec/features/proposal_spec.rb
+++ b/spec/features/proposal_spec.rb
@@ -2,14 +2,19 @@ require 'spec_helper'
feature Event do
- shared_examples 'proposal' do |user|
- scenario 'submitts a new proposal and updates account', feature: true, js: true do
+ shared_examples 'proposal workflow' do
+ scenario 'submitts a new proposal, accepts and confirms', feature: true, js: true do
+ admin = create(:admin, email: 'admin@example.com')
+ participant = create(:participant, email: 'participant@example.com')
+
expected_count = Event.count + 1
conference = create(:conference)
conference.call_for_papers = create(:call_for_papers)
+ conference.email_settings = create(:email_settings)
conference.event_types = [create(:event_type)]
- sign_in create(user)
+ #Submit a new proposal as participant
+ sign_in participant
visit conference_proposal_index_path(conference.short_title)
click_link 'New Proposal'
@@ -33,6 +38,7 @@ feature Event do
fill_in 'user_person_attributes_first_name', with: 'Example'
fill_in 'user_person_attributes_last_name', with: 'User'
+ fill_in 'user_person_attributes_biography', with: 'Lorem ipsum biography'
click_button 'Update'
@@ -40,12 +46,41 @@ feature Event do
to eq('You updated your account successfully.')
expect(Event.count).to eq(expected_count)
+
+ visit conference_proposal_index_path(conference.short_title)
+ expect(page.has_content?('Example Proposal')).to be true
+
+ sign_out
+
+ #Accept proposal as admin
+ sign_in admin
+
+ visit admin_conference_events_path(conference.short_title)
+ expect(page.has_content?('Example Proposal')).to be true
+
+ click_link 'New'
+ click_link 'accept_event'
+
+ expect(page.has_content?('Unconfirmed')).to be true
+ sign_out
+
+ #Confirm proposal as participant
+ sign_in participant
+ visit conference_proposal_index_path(conference.short_title)
+ expect(page.has_content?('Example Proposal')).to be true
+ expect(page.has_content?('Accepted (confirmation pending)')).to be true
+ click_link 'confirm_proposal'
+ expect(page.find('#flash_notice').text).
+ to eq('Event was confirmed. Please register to attend the conference.')
+
+ find('#register').click
+
+ expect(page.find('#flash_notice').text).
+ to eq('You are now registered.')
end
end
- describe 'proposal workflow' do
- it_behaves_like 'proposal', :participant
- it_behaves_like 'proposal', :organizer
- it_behaves_like 'proposal', :admin
+ describe 'proposal' do
+ it_behaves_like 'proposal workflow'
end
end
diff --git a/spec/support/login_macros.rb b/spec/support/login_macros.rb
index ad6abe3c..f4608fc5 100644
--- a/spec/support/login_macros.rb
+++ b/spec/support/login_macros.rb
@@ -8,4 +8,10 @@ module LoginMacros
expect(page.has_content?('Signed in successfully')).to be true
end
+
+ def sign_out
+ Capybara.current_session.driver.browser.clear_cookies
+ visit root_path
+ expect(page.has_content?('Sign In')).to be true
+ end
end