+
+ Dear <%= @user.name %>,
+
+ User <%= @comment.user.name %> posted a new comment for event <%= @event.title %> of <%= @conference.short_title %> .
+
+ "<%= @comment.body %>"
+
+ To reply to this comment, please go to <%= h(admin_conference_program_event_url(@conference.short_title, @event, only_path: false)) %>
+
+ Best wishes,
+ <%= @conference.title %> Team
+
+
+<%= render partial: "layouts/mailbot_footer" %>
\ No newline at end of file
diff --git a/app/views/mailbot/comment_template.text.erb b/app/views/mailbot/comment_template.text.erb
deleted file mode 100644
index d162d710..00000000
--- a/app/views/mailbot/comment_template.text.erb
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- Email
-
-
-
-
-
-
-
-
-
-
-
-
- Dear <%= @user.name %>,
-
- User <%= @comment.user.name %> posted a new comment for event <%= @event.title %> of <%= @conference.short_title %> .
-
- "<%= @comment.body %>"
-
- To reply to this comment, please go to <%= h(admin_conference_program_event_url(@conference.short_title, @event, only_path: false)) %>
-
- Best wishes,
- <%= @conference.title %> Team
-
-
+<%= render partial: "layouts/mailbot_footer" %>
\ No newline at end of file
diff --git a/app/views/mailbot/ticket_confirmation_template.html.erb b/app/views/mailbot/ticket_confirmation_template.html.erb
new file mode 100644
index 00000000..97a97c60
--- /dev/null
+++ b/app/views/mailbot/ticket_confirmation_template.html.erb
@@ -0,0 +1,14 @@
+<%= render partial: "layouts/mailbot_header" %>
+
+
+ Dear <%= @user.name %>,
+
+ Thanks! You have successfully booked <%= @ticket_purchase.quantity %> <%= @ticket_purchase.ticket.title %> ticket(s) for the event <%= @conference.title %>. Your transaction id is <%= @ticket_purchase.id %>.
+
+ Please, find the ticket(s) pdf attached.
+
+ Best wishes,
+ <%= @conference.title %> Team
+
+
-
- Dear <%= @user.name %>,
-
- Thanks! You have successfully booked <%= @ticket_purchase.quantity %> <%= @ticket_purchase.ticket.title %> ticket(s) for the event <%= @conference.title %>. Your transaction id is <%= @ticket_purchase.id %>.
-
- Please, find the ticket(s) pdf attached.
-
- Best wishes,
- <%= @conference.title %> Team
-
-
+
+ Dear <%= @user.name %>,
+
+ Thanks! You have successfully booked <%= @ticket_purchase.quantity %> <%= @ticket_purchase.ticket.title %> ticket(s) for the event <%= @conference.title %>. Your transaction id is <%= @ticket_purchase.id %>.
+
+ Please, find the ticket(s) pdf attached.
+
+ The SAP Young Thinkers team will reach out to you with information on how to participate in the event soon. In the meantime, you can check the event page (https://events.sap.com/yt-learning-festival-at-snapcon-2020/en/home) or send an email with your questions to youngthinkers@sap.com.
+
+ Best wishes,
+ <%= @conference.title %> Team
+
+
+<%= render partial: "layouts/mailbot_footer" %>
\ No newline at end of file
diff --git a/app/views/mailbot/young_thinkers_ticket_confirmation_template.text.erb b/app/views/mailbot/young_thinkers_ticket_confirmation_template.text.erb
deleted file mode 100644
index 6a4c7fb5..00000000
--- a/app/views/mailbot/young_thinkers_ticket_confirmation_template.text.erb
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- Email
-
-
-
-
-
-
-
-
-
-
-
-
- Dear <%= @user.name %>,
-
- Thanks! You have successfully booked <%= @ticket_purchase.quantity %> <%= @ticket_purchase.ticket.title %> ticket(s) for the event <%= @conference.title %>. Your transaction id is <%= @ticket_purchase.id %>.
-
- Please, find the ticket(s) pdf attached.
-
- The SAP Young Thinkers team will reach out to you with information on how to participate in the event soon. In the meantime, you can check the event page (https://events.sap.com/yt-learning-festival-at-snapcon-2020/en/home) or send an email with your questions to youngthinkers@sap.com.
-
- Best wishes,
- <%= @conference.title %> Team
-
-
-
-
-
-
-
diff --git a/app/views/payments/_payment.html.haml b/app/views/payments/_payment.html.haml
index 440f9985..bd70d8e8 100644
--- a/app/views/payments/_payment.html.haml
+++ b/app/views/payments/_payment.html.haml
@@ -19,7 +19,7 @@
%td
= humanized_money_with_symbol ticket.quantity * ticket.price
-= form_tag conference_payments_path do
+= form_tag conference_payments_path(@conference.short_title, :has_registration_ticket => @has_registration_ticket) do
%script.stripe-button{'src': "https://checkout.stripe.com/checkout.js",
'data': {amount: @total_amount_to_pay.cents,
label: "Pay #{humanized_money_with_symbol @total_amount_to_pay}",
diff --git a/app/views/physical_tickets/index.html.haml b/app/views/physical_tickets/index.html.haml
index f05215d7..e89ceeab 100644
--- a/app/views/physical_tickets/index.html.haml
+++ b/app/views/physical_tickets/index.html.haml
@@ -12,7 +12,7 @@
-# TODO: And if they have a registration ticket?
- if !@conference.user_registered?(@user) && @has_registration_ticket
.col-md-12
- .alert.alert-success{role: 'alert'}
+ .alert.alert-success{ role: 'alert' }
= link_to 'Complete Registration',
new_conference_conference_registration_path(@conference),
class: 'btn btn-info pull-right btn-lg'
diff --git a/app/views/physical_tickets/show.html.haml b/app/views/physical_tickets/show.html.haml
index 7dbc44da..ec8e7379 100644
--- a/app/views/physical_tickets/show.html.haml
+++ b/app/views/physical_tickets/show.html.haml
@@ -9,9 +9,9 @@
- if @conference.venue
at
%strong
- #{@conference.venue.name},
- #{@conference.venue.street},
- #{@conference.venue.city} / #{@conference.venue.country_name}.
+ #{@conference.venue_name},
+ #{@conference.venue_street},
+ #{@conference.city} / #{@conference.country_name}.
%small
= date_string(@conference.start_date, @conference.end_date)
.row
diff --git a/app/views/proposals/_encouragement_text.html.haml b/app/views/proposals/_encouragement_text.html.haml
index 5c4ccb73..f7f6033f 100644
--- a/app/views/proposals/_encouragement_text.html.haml
+++ b/app/views/proposals/_encouragement_text.html.haml
@@ -16,7 +16,8 @@
That means you have
%b.notranslate= pluralize(@program.cfp.remaining_days, 'day')
left!
- %span.notranslate #{@conference.title}
- will only be as good as the content you present. Submit early, submit often!
+ %span.notranslate= @conference.title
+ will only be as good as the content you present.
+ %br Submit early, submit often!
- else
The submission period is closed now.
diff --git a/app/views/proposals/_proposal_form.html.haml b/app/views/proposals/_proposal_form.html.haml
index 00cf9a90..eb03e9fa 100644
--- a/app/views/proposals/_proposal_form.html.haml
+++ b/app/views/proposals/_proposal_form.html.haml
@@ -11,83 +11,49 @@
= track_selector_input f
- = f.input :event_type_id, as: :select,
- collection: @conference.program.event_types.map {|type| ["#{type.title} - #{show_time(type.length)}", type.id,
- data: { min_words: type.minimum_abstract_length, max_words: type.maximum_abstract_length, help: type.description }]},
- include_blank: false, label: 'Type', input_html: { class: 'select-help-toggle' }
-
- if @program.languages.present?
= f.input :language, as: :select,
collection: @languages,
include_blank: false, label: 'Language', input_html: { class: 'select-help-toggle' }
- - @conference.program.event_types.each do |event_type|
- %span{ class: 'help-block select-help-text event_event_type_id collapse', id: "#{event_type.id}-help" }
- = event_type.description
+ - if @program.difficulty_levels.present?
+ = f.input :difficulty_level, as: :select, collection: @program.difficulty_levels,
+ input_html: { class: 'select-help-toggle' },
+ include_blank: '(Please select)' if @conference.program.difficulty_levels.any?
- = f.input :difficulty_level, as: :select, collection: @conference.program.difficulty_levels, input_html: { class: 'select-help-toggle' },
- include_blank: '(Please select)' if @conference.program.difficulty_levels.any?
+ - @program.difficulty_levels.each do |difficulty_level|
+ %span{ class: 'help-block select-help-text collapse event_difficulty_level_id', id: "#{difficulty_level.id}-help" }
+ = difficulty_level.description
- - @conference.program.difficulty_levels.each do |difficulty_level|
- %span{ class: 'help-block select-help-text collapse event_difficulty_level_id', id: "#{difficulty_level.id}-help" }
- = difficulty_level.description
-
- = f.input :abstract, required: true, input_html: { rows: 5, data: { provide: 'markdown' } },
- hint: markdown_hint('[Tips to improve your presentations.](http://blog.hubspot.com/blog/tabid/6307/bid/5975/10-Rules-to-Instantly-Improve-Your-Presentations.aspx)')
-
- %p
- You have used
- %span#abstract-count #{@event.abstract_word_count}
- words. Abstracts must be between
- %span#abstract-minimum-word-count
- 0
- and
- %span#abstract-maximum-word-count
- 250
- words.
-
- %br
-
- = f.input :submission_text, input_html: { rows: 5, data: { provide: 'markdown' }, placeholder: '' },
- hint: markdown_hint('Only conference organizers will read this.')
-
- %p
- You have used
- %span#submission-count #{@event.submission_word_count}
- words. Submission descriptions must be between
- %span#submission-minimum-word-count
- 0
- and
- %span#submission-maximum-word-count
- 250
- words.
+ = render 'proposals/submission_type_content_form', f: f, program: @program
+ -# TODO-SNAPCON: Extract this to be a `conference_committee_role?`
- if current_user.has_any_role? :admin, { name: :organizer, resource: @conference }, { name: :cfp, resource: @conference }
%br
- = f.input :committee_review, input_html: { rows: 5, data: { provide: 'markdown' }, placeholder: '' },
- hint: markdown_hint('This field is shared with the submission authors.')
+ = f.input :committee_review, input_html: { rows: 5, data: { provide: 'markdown' } },
+ hint: markdown_hint('This field is shared with the submission authors.')
- - if current_user.is_admin? or @program.cfp.enable_registrations?
+ - if @program.cfp&.enable_registrations?
= f.inputs 'Enable pre-registration' do
= f.input :require_registration, label: 'Require participants to register to your event'
- message = @event.room ? "Value must be between 1 and #{@event.room.size}" : 'Check room capacity after scheduling.'
= f.input :max_attendees, hint: 'The maximum number of participants. ' + message
- - if current_user.has_any_role? :admin, { name: :organizer, resource: @conference }, { name: :cfp, resource: @conference }
- = f.input :is_highlight
-
%p.text-right
= link_to '#description', 'data-toggle' => 'collapse' do
Do you require something special?
#description{ class: "collapse #{ 'in' if @event.description.present? }" }
= f.input :description, input_html: { rows: 5 }, label: 'Requirements', placeholder: 'Eg. Whiteboard, printer, or something like that.'
+ - if current_user.has_any_role? :admin, { name: :organizer, resource: @conference }, { name: :cfp, resource: @conference }
+ %p (Admin Only)
+ = f.input :is_highlight
%p.text-right
- if @event.new_record?
= f.submit 'Submit Proposal', class: 'btn btn-success'
- else
- = f.submit 'Update Proposal', class: 'btn btn-success'
+ = f.submit 'Update Proposal', class: 'btn btn-primary'
:javascript
$(document).ready(function() {
diff --git a/app/views/proposals/_speaker_info.haml b/app/views/proposals/_speaker_info.haml
index d757d9b4..552ff6ed 100644
--- a/app/views/proposals/_speaker_info.haml
+++ b/app/views/proposals/_speaker_info.haml
@@ -1,13 +1,13 @@
.speakerinfo
.row
.col-md-4
- = image_tag speaker.profile_picture(:size => 120), class: 'img-responsive img-rounded'
+ = image_tag speaker.profile_picture(size: 120), class: 'img-responsive img-rounded'
.col-md-8
%h4
= link_to speaker.name, user_path(speaker.id)
%br
- if speaker.email_public?
- = mail_to "#{ speaker.email }" do
+ = mail_to speaker.email.to_s do
%i.fa.fa-envelope-o.fa-2x
- if speaker.affiliation?
.text-muted
diff --git a/app/views/proposals/_submission_type_content_form.haml b/app/views/proposals/_submission_type_content_form.haml
new file mode 100644
index 00000000..367695f3
--- /dev/null
+++ b/app/views/proposals/_submission_type_content_form.haml
@@ -0,0 +1,68 @@
+-# PARTIAL FOR EVENT/PROPOSAL FORM
+
+= f.input :event_type_id, as: :select, include_blank: false, label: 'Type',
+ input_html: { class: 'select-help-toggle' },
+ collection: event_type_options(program.event_types)
+
+
+- program.event_types.each do |event_type|
+ .help-block.event_event_type_id.collapse{ id: "#{event_type.id}-help" }
+ %strong Description
+ %div
+ = markdown(event_type.description)
+
+%h3 Submission Abstract
+%p
+ The abstract is reviewed by the committee and included in the conference program.
+ You are encouraged to include links or other references as appropriate.
+
+= f.label :abstract, class: 'sr-only'
+= f.input :abstract, required: true, label: false,
+ input_html: { rows: 5, data: { provide: 'markdown' } },
+ hint: markdown_hint
+
+%p
+ You have used
+ %span#abstract-count 0
+ words. Abstracts must be between
+ %span#abstract-minimum-word-count 0
+ and
+ %span#abstract-maximum-word-count 250
+ words.
+
+%hr
+%h3 Submission Details
+%p
+ This part of the submission is intended only for the conference committee.
+
+- program.event_types.each do |event_type|
+ .help-block.select-help-text.event_event_type_id.collapse{ id: "#{event_type.id}-instructions" }
+ - if event_type.submission_instructions.blank?
+ %p
+ Use this space to include any additional inforrmation that is helpful in reviewing your
+ submission. If you have any co-presenters, please include them
+ below. After submission, you will have the opportunity to add them to the
+ speakers list. (However, they must have an active #{ENV['OSEM_NAME']} account.)
+ - else
+ %p
+ Please use the following as the template for your submission. This will help the conference
+ committee review your submission with all the details they need. If you have any
+ co-presenters, please include them below. After submission, you will have the opportunity
+ to add them to the speakers list. (However, they must have an active #{ENV['OSEM_NAME']}
+ account.)
+ .panel.panel-primary
+ .panel-heading
+ = event_type.name
+ Template
+ .panel-body
+ = markdown(event_type.submission_instructions)
+ .panel-footer
+ %button.btn.btn-warning.btn-xs.js-resetSubmissionText{ type: 'button',
+ data: { confirm: 'Do you really want to reset your submission text to the provided template?' } }
+ Reset Submission to Template
+ %span.small You may want to use this if you have changed the submission type.
+
+= f.label :submission_text, class: 'sr-only'
+= f.input :submission_text, label: false,
+ input_html: { rows: 10, data: { provide: 'markdown' } },
+ hint: markdown_hint
diff --git a/app/views/proposals/_tooltip.html.haml b/app/views/proposals/_tooltip.html.haml
index 2220451d..23fb1c0d 100644
--- a/app/views/proposals/_tooltip.html.haml
+++ b/app/views/proposals/_tooltip.html.haml
@@ -1,30 +1,31 @@
- progress_status = event.progress_status
%ul.list-unstyled
- if can? :create, @conference.registrations.new
- %li{'class'=>class_for_todo(progress_status['registered'])}
- %span{'class'=>icon_for_todo(progress_status['registered'])}
- - if progress_status['registered']
+ %li{class: class_for_todo(progress_status[:registered])}
+ %span{class: icon_for_todo(progress_status[:registered])}
+ - if progress_status[:registered]
Speaker(s) registered to the conference
- else
= link_to 'Speaker(s) not registered to the conference', new_conference_conference_registration_path(event.program.conference.short_title)
- %li{'class'=>class_for_todo(progress_status['biographies'])}
- %span{'class'=>icon_for_todo(progress_status['biographies'])}
- - if progress_status['biographies']
+ %li{class: class_for_todo(progress_status[:biographies])}
+ %span{class: icon_for_todo(progress_status[:biographies])}
+ - if progress_status[:biographies]
Speakers have filled out their biographies
- elsif current_user.biography.blank? && event.speakers.include?(current_user)
= link_to 'Fill out your biography', edit_user_path(current_user)
- else
Speakers' biographies missing
- %li{'class'=>class_for_todo(progress_status['subtitle'])}
- %span{'class'=>icon_for_todo(progress_status['subtitle'])}
+ %li{class: class_for_todo(progress_status[:subtitle])}
+ %span{class: icon_for_todo(progress_status[:subtitle])}
= link_to 'Add a subtitle', edit_conference_program_proposal_path(event.program.conference.short_title, event)
- %li{'class'=>class_for_todo(progress_status['commercials'])}
- %span{'class'=>icon_for_todo(progress_status['commercials'])}
+ %li{class: class_for_todo(progress_status[:commercials])}
+ %span{class: icon_for_todo(progress_status[:commercials])}
= link_to 'Add materials', edit_conference_program_proposal_path(event.program.conference.short_title, event, anchor: 'commercials-content')
- - unless progress_status['track'].nil?
- %li{'class'=>class_for_todo(progress_status['track'])}
- %span{'class'=>icon_for_todo(progress_status['track'])}
+ - unless progress_status[:track].nil?
+ %li{class: class_for_todo(progress_status[:track])}
+ %span{class: icon_for_todo(progress_status[:track])}
= link_to 'Add a track', edit_conference_program_proposal_path(event.program.conference.short_title, event)
- %li{'class'=>class_for_todo(progress_status['difficulty_level'])}
- %span{'class'=>icon_for_todo(progress_status['difficulty_level'])}
- = link_to 'Add a difficulty level', edit_conference_program_proposal_path(event.program.conference.short_title, event)
+ - unless progress_status[:difficulty_level].nil?
+ %li{class: class_for_todo(progress_status[:difficulty_level])}
+ %span{class: icon_for_todo(progress_status[:difficulty_level])}
+ = link_to 'Add a difficulty level', edit_conference_program_proposal_path(event.program.conference.short_title, event)
diff --git a/app/views/proposals/_volunteer_info.haml b/app/views/proposals/_volunteer_info.haml
index f5e3e21b..ae63c327 100644
--- a/app/views/proposals/_volunteer_info.haml
+++ b/app/views/proposals/_volunteer_info.haml
@@ -1,7 +1,7 @@
.speakerinfo
.row
.col-md-4
- = image_tag speaker.profile_picture(:size => 120), class: 'img-responsive img-rounded'
+ = image_tag speaker.profile_picture(size: 120), class: 'img-responsive img-rounded'
.col-md-8
%h4
= link_to speaker.name, user_path(speaker.id)
diff --git a/app/views/proposals/_volunteers_table.haml b/app/views/proposals/_volunteers_table.haml
index df99ce53..c842c1de 100644
--- a/app/views/proposals/_volunteers_table.haml
+++ b/app/views/proposals/_volunteers_table.haml
@@ -1,8 +1,8 @@
%table.table.table-striped#events
- events.each do |event|
%tr
- %td.col-md-7{style: "padding:20px 8px 20px 8px;"}
- = link_to event.title, conference_program_proposal_path(@conference.short_title, event.id)
+ %td.col-md-7{ style: 'padding:20px 8px 20px 8px;' }
+ = link_to event.title, conference_program_proposal_path(conference.short_title, event.id)
%br
%small.text-muted
= event.event_type.title
@@ -10,10 +10,11 @@
= "in #{event.track.name}" if event.track
- if event.require_registration
%br
- = link_to registered_text(event), registrations_conference_program_proposal_path(@conference.short_title, event), class: 'btn btn-xs btn-danger'
+ = link_to registered_text(event), registrations_conference_program_proposal_path(conference.short_title, event),
+ class: 'btn btn-xs btn-danger'
- %td.col-md-2{style: "padding:20px 8px 20px 8px;"}
- - event_schedule = event.event_schedules.find_by(schedule_id: @program.selected_schedule_id)
+ %td.col-md-2{ style: 'padding:20px 8px 20px 8px;' }
+ - event_schedule = event.event_schedules.find_by(schedule_id: program.selected_schedule_id)
- if event_schedule.present?
- = inyourtz(event_schedule.start_time, @conference.timezone) do
- = event_schedule.start_time.strftime("%Y %B %e - %H:%M")
+ = inyourtz(event_schedule.start_time, conference.timezone) do
+ = event_schedule.start_time.strftime('%Y %B %e - %H:%M')
diff --git a/app/views/proposals/index.html.haml b/app/views/proposals/index.html.haml
index 6785af29..2cc41860 100644
--- a/app/views/proposals/index.html.haml
+++ b/app/views/proposals/index.html.haml
@@ -121,7 +121,7 @@
Volunteer Duties
%small
Thanks for being a host at #{@conference.title}
- = render 'volunteers_table', events: @volunteer_events
+ = render 'volunteers_table', events: @volunteer_events, conference: @conference, program: @program
.row
.col-md-12
diff --git a/app/views/proposals/new.html.haml b/app/views/proposals/new.html.haml
index bdd16e11..7c709235 100644
--- a/app/views/proposals/new.html.haml
+++ b/app/views/proposals/new.html.haml
@@ -5,6 +5,7 @@
%h1 New #{@conference.title} Proposal
- if @program.cfp_open?
- if @program.cfp.description.present?
+ %h2 Call for Proposals
.row
.col-md-12
= markdown(@program.cfp.description, escape_html=false)
@@ -31,51 +32,22 @@
= f.inputs name: 'Proposal Information' do
= f.input :title, as: :string, required: true, input_html: { required: true }
- = f.input :event_type_id, as: :select,
- collection: @program.event_types.map {|type| ["#{type.title} - #{show_time(type.length)}", type.id,
- data: { min_words: type.minimum_abstract_length, max_words: type.maximum_abstract_length }]},
- include_blank: false, label: 'Type', input_html: { class: 'select-help-toggle' }
-
- - @program.event_types.each do |event_type|
- %div{ class: 'help-block event_event_type_id collapse', id: "#{event_type.id}-help"}
- %strong Directions
- %div
- = markdown(event_type.description)
- if @program.languages.present?
= f.input :language, as: :select,
collection: @languages,
include_blank: false, label: 'Language', input_html: { class: 'select-help-toggle' }
- = f.input :abstract, required: true, input_html: { rows: 5, data: { provide: 'markdown' } },
- hint: markdown_hint
-
- %p
- You have used
- %span#abstract-count #{@event.abstract_word_count}
- words. Abstracts must be between
- %span#abstract-minimum-word-count
- 0
- and
- %span#abstract-maximum-word-count
- 250
- words.
-
- = f.input :submission_text, input_html: { rows: 5, data: { provide: 'markdown' } },
- hint: markdown_hint
-
- %p
- You have used
- %span#submission-count #{@event.submission_word_count}
- words. Submission descriptions must be between
- %span#submission-minimum-word-count
- 0
- and
- %span#submission-maximum-word-count
- 250
- words.
+ - if @program.difficulty_levels.present?
+ = f.input :difficulty_level, as: :select, collection: @program.difficulty_levels,
+ input_html: { class: 'select-help-toggle' },
+ include_blank: '(Please select)' if @conference.program.difficulty_levels.any?
+ - @program.difficulty_levels.each do |difficulty_level|
+ %span.help-block.select-help-text.collapse.event_difficulty_level_id{ id: "#{difficulty_level.id}-help" }
+ = difficulty_level.description
+ = render 'submission_type_content_form', f: f, program: @program
- if @program.cfp.enable_registrations?
= f.input :require_registration, label: 'Require participants to register to your event'
@@ -88,7 +60,7 @@
= f.input :description, input_html: { rows: 5 }, label: 'Requirements', placeholder: 'Eg. Whiteboard, printer, or something like that.'
%p.text-right
- = f.submit 'Submit Proposal', class: 'btn btn-success'
+ = f.submit 'Submit Proposal', class: 'btn btn-success btn-lg'
.tab-pane{role: 'tabpanel', id: 'signin'}
= render partial: 'devise/shared/sign_in_form_embedded'
diff --git a/app/views/schedules/_event.html.haml b/app/views/schedules/_event.html.haml
index 25257c0d..dbd16b10 100644
--- a/app/views/schedules/_event.html.haml
+++ b/app/views/schedules/_event.html.haml
@@ -1,20 +1,20 @@
-.panel.panel-default.event-panel{ onClick: 'eventClicked(event, this);', "data-url" => "#{url_for(conference_program_proposal_path(@conference.short_title, event.id))}" }
+.panel.panel-default.event-panel{ onClick: 'eventClicked(event, this);', 'data-url' => "#{url_for(conference_program_proposal_path(@conference.short_title, event.id))}" }
- header_color = event.event_type&.color || '#f5f5f5'
- .trapezoid{style: "color: white; top: 12px; z-index: 100;"}
+ .trapezoid{ style: 'color: white; top: 12px; z-index: 100;' }
.panel-heading{ style: "background-color: #{header_color}; color: #{ contrast_color(header_color) }; border-radius: 4px" }
- event.speakers_ordered.each do |speaker|
- = image_tag speaker.profile_picture, class: "img-circle pull-right", alt: speaker.name, style: "padding: 2px;"
+ = image_tag speaker.profile_picture, class: 'img-circle pull-right', alt: speaker.name, style: 'padding: 2px;'
%p
= canceled_replacement_event_label(event, event_schedule)
= replacement_event_notice(event_schedule)
- %span.h3{style: "margin-bottom: 14px"}
+ %span.h3{ style: 'margin-bottom: 14px' }
= event.title
%br
- %small{style: "color: #{contrast_color(header_color)}"}
+ %small{ style: "color: #{contrast_color(header_color)}" }
= event.subtitle
- .trapezoid{style: "color: #{header_color}; top: 12px;"}
+ .trapezoid{ style: "color: #{header_color}; top: 12px;" }
.panel-body
%h4
@@ -30,13 +30,13 @@
= inyourtz(event_schedule.start_time) do
%span.track
%span.fa.fa-clock-o
- %span.label{ style: "background-color: grey" }
+ %span.label{ style: 'background-color: grey' }
= event_schedule.start_time.strftime('%l:%M %P')
\-
= event_schedule.end_time.strftime('%l:%M %P')
%span.track
%span.fa.fa-map-marker
- %span.label{ style: "background-color: grey" }
+ %span.label{ style: 'background-color: grey' }
= event_schedule.room.name
- if event.track
%span.track
diff --git a/app/views/schedules/happening_now.haml b/app/views/schedules/happening_now.haml
index bfa2aced..6c3d8f5b 100644
--- a/app/views/schedules/happening_now.haml
+++ b/app/views/schedules/happening_now.haml
@@ -9,26 +9,30 @@
.col-md-12
%h2
#{pluralize(@events_schedules.count, 'Event')} Occurring Within The Next 30 minutes.
- %h3
- This page was loaded at
- = inyourtz(Time.now) do
- #{Time.now.strftime('%a %b %d at %I:%M %P (%z)')}
+ %br
+ %small
+ This page was loaded at
+ = inyourtz(Time.now) do
+ = Time.now.strftime('%a %b %d at %I:%M %P (%z)')
+ \.
.row
/ TODO: Clean this up, merge with all events page.
- / scheduled events
- date = nil
- time = nil
- @events_schedules.each do |event_schedule|
- unless event_schedule.start_time.strftime('%Y-%m-%d').eql?(date)
.col-xs-12.col-md-12
.date-content
- %span{ class: 'date-title', id: "#{ event_schedule.start_time.strftime('%Y-%m-%d') }" }
+ %span.date-title{ id: event_schedule.start_time.strftime('%Y-%m-%d').to_s }
= inyourtz(event_schedule.start_time, @conference.timezone) do
= date = event_schedule.start_time.strftime('%Y-%m-%d')
- %a{ title: "Go up", class: "pull-right", href: "#program" }
- %i{ class: "fa fa-angle-double-up fa-lg", 'aria-hidden' => true }
- - unless event_schedule.start_time.strftime('%H:%M').eql?(time)
+ %a.pull-right{ title: 'Go up', href: '#program' }
+ %i.fa.fa-angle-double-up.fa-lg{ 'aria-hidden' => true }
+ - if event_schedule.start_time.strftime('%H:%M').eql?(time)
+ .col-xs-12.col-md-11.col-md-offset-1
+ = render 'event', event: event_schedule.event, event_schedule: event_schedule
+ - else
.col-xs-12.col-md-1
.start-time
= inyourtz(event_schedule.start_time, @conference.timezone) do
@@ -36,9 +40,6 @@
.col-xs-12.col-md-11
.new-time-event
= render 'event', event: event_schedule.event, event_schedule: event_schedule
- - else
- .col-xs-12.col-md-11.col-md-offset-1
- = render 'event', event: event_schedule.event, event_schedule: event_schedule
:javascript
// Refresh the page every 5 minutes.
diff --git a/app/views/schedules/show.html.haml b/app/views/schedules/show.html.haml
index c1ca83aa..f7b72b39 100644
--- a/app/views/schedules/show.html.haml
+++ b/app/views/schedules/show.html.haml
@@ -26,9 +26,13 @@
.visible-md-inline.visible-lg-inline
= render partial: 'carousel', locals: { date: date, hrs_per_slide: 3 }
- %p.pull-right
- = link_to app_conference_schedule_path do
- Get the mobile app!
+ %p
+ %span
+ = link_to conference_schedule_url(protocol: 'webcal', format: 'ics') do
+ Add the schedule to your calendar
+ %span.pull-right
+ = link_to app_conference_schedule_path do
+ Get the mobile app!
:javascript
// change of active tab and the button title when a date is clicked
diff --git a/bin/travis_script.sh b/bin/travis_script.sh
index 3f4f52cf..dfcbfcac 100755
--- a/bin/travis_script.sh
+++ b/bin/travis_script.sh
@@ -12,23 +12,23 @@ else
fi
case $TEST_SUITE in
- linters)
+ linters|all)
bundle exec rubocop -Dc .rubocop.yml
bundle exec haml-lint app/views
- ;;
- models)
+ ;;&
+ models|all)
bundle exec rspec --format documentation spec/models
- ;;
- features)
+ ;;&
+ features|all)
bundle exec rspec --format documentation spec/features
- ;;
- controllers)
+ ;;&
+ controllers|all)
bundle exec rspec --format documentation spec/controllers
- ;;
- ability)
+ ;;&
+ ability|all)
bundle exec rspec --format documentation spec/ability
- ;;
- rest)
+ ;;&
+ rest|all)
bundle exec rspec --format documentation --exclude-pattern "spec/{models,features,controllers,ability}/**/*_spec.rb"
;;
esac
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 6f2a1042..5b6263e3 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -114,4 +114,6 @@ Osem::Application.configure do
end
end
+ config.assets.precompile += ['mailbot.css']
+ config.active_record.verbose_query_logs = true
end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 60e023a0..d41774af 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -26,7 +26,7 @@ Osem::Application.configure do
config.assets.digest = true
config.assets.css_compressor = :sass
- config.assets.js_compressor = :uglifier
+ config.assets.js_compressor = Uglifier.new(harmony: true)
config.assets.gzip = true
# Defaults to nil and saved in location specified by config.assets.prefix
@@ -97,7 +97,7 @@ Osem::Application.configure do
domain: ENV['OSEM_SMTP_DOMAIN'],
enable_starttls_auto: ENV['OSEM_SMTP_ENABLE_STARTTLS_AUTO'],
openssl_verify_mode: ENV['OSEM_SMTP_OPENSSL_VERIFY_MODE']
- }
+ }.compact
# Set the secret_key_base from the env, if not set by any other means
config.secret_key_base ||= ENV["SECRET_KEY_BASE"]
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 225ae26f..1a9d4d7b 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -52,4 +52,5 @@ Osem::Application.configure do
ActiveSupport::Deprecation.silenced = true
end
+ config.assets.precompile += ['mailbot.css']
end
diff --git a/config/initializers/active_record_log_subscriber.rb b/config/initializers/active_record_log_subscriber.rb
deleted file mode 100644
index 52ec87a7..00000000
--- a/config/initializers/active_record_log_subscriber.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# http://www.jkfill.com/2015/02/14/log-which-line-caused-a-query/
-module LogQuerySource
- def debug(*args, &block)
- return unless super
-
- backtrace = Rails.backtrace_cleaner.clean caller
-
- relevant_caller_line = backtrace.detect do |caller_line|
- !caller_line.include?('/initializers/')
- end
-
- if relevant_caller_line
- logger.debug(" ↳ #{ relevant_caller_line.sub("#{ Rails.root }/", '') }")
- end
- end
-end
-ActiveRecord::LogSubscriber.send :prepend, LogQuerySource
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index e9a315d8..64889d47 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -1,5 +1,6 @@
CarrierWave.configure do |config|
config.storage = :file
+ config.cache_storage = :file
config.cache_dir = "#{Rails.root}/tmp/uploads"
config.enable_processing = false if Rails.env.test?
end
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 26fca25b..6c2749e1 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -112,10 +112,10 @@ Devise.setup do |config|
# ==> Configuration for :confirmable
# A period that the user is allowed to access the website even without
- # confirming his account. For instance, if set to 2.days, the user will be
- # able to access the website for two days without confirming his account,
+ # confirming their account. For instance, if set to 2.days, the user will be
+ # able to access the website for two days without confirming their account,
# access will be blocked just in the third day. Default is 0.days, meaning
- # the user cannot access the website without confirming his account.
+ # the user cannot access the website without confirming their account.
config.allow_unconfirmed_access_for = 2.days
# If true, requires any email changes to be confirmed (exactly the same way as
diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb
index a94cc79a..55afb7ac 100644
--- a/config/initializers/sentry.rb
+++ b/config/initializers/sentry.rb
@@ -1,6 +1,7 @@
Sentry.init do |config|
config.enabled_environments = %|production staging|
config.dsn = ENV['SENTRY_DSN']
+ # config.dsn = ENV.fetch('OSEM_SENTRY_DSN', Rails.application.secrets.sentry_dsn)
config.breadcrumbs_logger = [:active_support_logger]
# To activate performance monitoring, set one of these options.
@@ -8,6 +9,15 @@ Sentry.init do |config|
config.traces_sample_rate = 0.5
# or
# config.traces_sampler = lambda do |context|
- # true
+ # true
# end
+
+ # During deployment we touch tmp/restart.txt, let's use its last access time as release.
+ # Unless someone has set a variable of course...
+ # osem_version_from_file = nil
+ # version_file = File.expand_path('../../tmp/restart.txt', __dir__)
+ # osem_version_from_file = File.new(version_file).atime.to_i if File.file?(version_file)
+ # osem_version = ENV.fetch('OSEM_SENTRY_RELEASE', osem_version_from_file)
+ osem_version = ENV['HEROKU_RELEASE_VERSION']
+ config.release = osem_version if osem_version
end
diff --git a/config/routes.rb b/config/routes.rb
index e69232fe..ec8a5fb0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -221,8 +221,8 @@ Osem::Application.routes.draw do
end
end
- get '/admin' => redirect('/admin/conferences')
-
+ # Handle conferences on custom domains.
+ # This *must* come before any other root definition.
constraints DomainConstraint do
root to: 'conferences#show'
end
@@ -233,5 +233,7 @@ Osem::Application.routes.draw do
root to: 'conferences#index', via: [:get, :options]
end
+ get '/admin' => redirect('/admin/conferences')
+ get '/calendar' => 'conferences#calendar'
get '/.well-known/apple-developer-merchantid-domain-association', to: 'application#apple_pay'
end
diff --git a/config/secrets.yml.example b/config/secrets.yml.example
index a8d67504..c0d92bbf 100644
--- a/config/secrets.yml.example
+++ b/config/secrets.yml.example
@@ -31,8 +31,8 @@ production:
# Generate your own with rake secret or use the environment
# secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
- # Your errbit API key
- # errbit_key: '12345'
+ # Your sentry.io DSN key
+ # sentry_dsn: '12345'
########## OMNIAUTH Providers ##########
# Leave the variables' names empty, unless you use the providers, in which
diff --git a/db/migrate/20210306185903_add_submission_instructions_to_event_types.rb b/db/migrate/20210306185903_add_submission_instructions_to_event_types.rb
new file mode 100644
index 00000000..f38243d1
--- /dev/null
+++ b/db/migrate/20210306185903_add_submission_instructions_to_event_types.rb
@@ -0,0 +1,5 @@
+class AddSubmissionInstructionsToEventTypes < ActiveRecord::Migration[5.2]
+ def change
+ add_column :event_types, :submission_instructions, :text
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 42c64634..00191e5b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2021_03_03_052026) do
+ActiveRecord::Schema.define(version: 2021_03_06_185903) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -222,6 +222,7 @@ ActiveRecord::Schema.define(version: 2021_03_03_052026) do
t.integer "program_id"
t.datetime "created_at"
t.datetime "updated_at"
+ t.text "submission_instructions"
end
create_table "event_users", force: :cascade do |t|
diff --git a/docker-compose.yml b/docker-compose.yml
index ca3e36f7..23dd8b67 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: "2.4"
services:
database:
- image: postgres
+ image: postgres:12-alpine
environment:
PGDATA: /var/lib/postgresql/data/pgdata
POSTGRES_PASSWORD: $OSEM_DB_PASSWORD
diff --git a/docker-compose.yml.production-example b/docker-compose.yml.production-example
index ed4892a2..3c09ccd5 100644
--- a/docker-compose.yml.production-example
+++ b/docker-compose.yml.production-example
@@ -2,7 +2,7 @@ version: "2.4"
services:
production_database:
- image: postgres
+ image: postgres:12-alpine
environment:
PGDATA: /var/lib/postgresql/data/pgdata
POSTGRES_PASSWORD: $OSEM_DB_PASSWORD
diff --git a/dotenv.example b/dotenv.example
index 89cd16e9..85f45c59 100644
--- a/dotenv.example
+++ b/dotenv.example
@@ -49,12 +49,8 @@
# See https://github.com/openSUSE/osem/wiki/Translation
# OSEM_TRANSIFEX_APIKEY=1234
-# The errbit host to post exceptions to
-# OSEM_ERRBIT_HOST=errbit.example.com
-# The project to use on the errbit host
-# OSEM_ERRBIT_ID=1234
-# The key for this project
-# OSEM_ERRBIT_KEY=5678
+# sentry.io DSN key
+# OSEM_SENTRY_DSN=1234
# OMNIAUTH Developer Key/Secret for GOOGLE
# OSEM_GOOGLE_KEY=1234
diff --git a/google-packaging.key b/google-packaging.key
deleted file mode 100644
index 04298f55..00000000
--- a/google-packaging.key
+++ /dev/null
@@ -1,235 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=EXOv
------END PGP PUBLIC KEY BLOCK-----
diff --git a/lib/tasks/migrate_config.rake b/lib/tasks/migrate_config.rake
index 9617dafe..7cd22ade 100644
--- a/lib/tasks/migrate_config.rake
+++ b/lib/tasks/migrate_config.rake
@@ -34,7 +34,7 @@ namespace :data do
dot_env.puts "OSEM_SMTP_USERNAME=\"#{CONFIG['mail_username']}\""
dot_env.puts "OSEM_SMTP_PASSWORD=\"#{CONFIG['mail_password']}\""
dot_env.puts "OSEM_SMTP_AUTHENTICATION=\"#{CONFIG['mail_authentication']}\""
- dot_env.puts 'OSEM_SMTP_DOMAIN=""'
+ dot_env.puts '# OSEM_SMTP_DOMAIN="example.com"'
dot_env.close
puts "Migrated config/config.yml to .env.#{Rails.env}"
diff --git a/lib/tasks/spec.rake b/lib/tasks/spec.rake
new file mode 100644
index 00000000..fddcec62
--- /dev/null
+++ b/lib/tasks/spec.rake
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+unless Rails.env.production?
+ namespace :spec do
+ desc 'rspec ability'
+ task :ability do
+ sh 'bundle exec rspec --format documentation spec/ability'
+ end
+ desc 'rspec models'
+ task :models do
+ sh 'bundle exec rspec --format documentation spec/models'
+ end
+ desc 'rspec controllers'
+ task :controllers do
+ sh 'bundle exec rspec --format documentation spec/controllers'
+ end
+ desc 'rspec features'
+ task :features do
+ sh 'bundle exec rspec --format documentation spec/features'
+ end
+ desc 'rspec the leftovers'
+ task :leftovers do
+ sh 'bundle exec rspec --format documentation --exclude-pattern "spec/{models,features,controllers,ability}/**/*_spec.rb"'
+ end
+ end
+end
diff --git a/spec/controllers/admin/cfps_controller_spec.rb b/spec/controllers/admin/cfps_controller_spec.rb
index 617417a1..f3f16298 100644
--- a/spec/controllers/admin/cfps_controller_spec.rb
+++ b/spec/controllers/admin/cfps_controller_spec.rb
@@ -1,5 +1,3 @@
-require 'pry'
-
# frozen_string_literal: true
require 'spec_helper'
diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb
index 50eda9b1..c3d29b81 100644
--- a/spec/controllers/admin/users_controller_spec.rb
+++ b/spec/controllers/admin/users_controller_spec.rb
@@ -8,10 +8,10 @@ describe Admin::UsersController do
sign_in(admin)
end
describe 'GET #index' do
- it 'sets up users array with existing users records' do
+ xit 'sets up users array with existing users records' do
user1 = create(:user, email: 'user1@email.osem')
user2 = create(:user, email: 'user2@email.osem')
- user_deleted = User.find_by(name: 'User deleted')
+ user_deleted = User.find_by!(username: 'deleted_user')
get :index
expect(assigns(:users)).to match_array([user_deleted, user, admin, user1, user2])
end
@@ -103,4 +103,21 @@ describe Admin::UsersController do
end
end
end
+
+ describe 'DELETE #destroy' do
+ before do
+ delete :destroy, params: { id: user.id }
+ end
+ it 'redirects to admin users index path' do
+ expect(response).to redirect_to admin_users_path
+ end
+
+ it 'shows success message in flash notice' do
+ expect(flash[:notice]).to match("User #{user.id} (#{user.email}) deleted.")
+ end
+
+ it 'deletes the user' do
+ expect { user.reload }.to raise_error(ActiveRecord::RecordNotFound)
+ end
+ end
end
diff --git a/spec/datatables/user_datatable_spec.rb b/spec/datatables/user_datatable_spec.rb
index 90327233..6c0de8d8 100644
--- a/spec/datatables/user_datatable_spec.rb
+++ b/spec/datatables/user_datatable_spec.rb
@@ -8,7 +8,7 @@ describe UserDatatable do
end
let(:data_cols) do
- [:id, :confirmed_at, :email, :name, :username, :attended, :roles, :view_url, :edit_url, :DT_RowId]
+ [:id, :confirmed_at, :email, :name, :username, :attended, :roles, :view_url, :edit_url, :DT_RowId, :confirmed]
end
let(:view) do
view = double(
@@ -126,7 +126,6 @@ describe UserDatatable do
end
it 'confirmed_at' do
-
expect(Date.parse(user_data[:confirmed_at])).to eq(user.confirmed_at.to_date)
end
diff --git a/spec/factories/conferences.rb b/spec/factories/conferences.rb
index d1ac5032..1968e54e 100644
--- a/spec/factories/conferences.rb
+++ b/spec/factories/conferences.rb
@@ -49,6 +49,7 @@ FactoryBot.define do
ticket_layout { 'portrait' }
description { Faker::Hipster.paragraph }
organization
+ color { '#FFFFFF' }
after(:create) do |conference|
Role.where(name: 'organizer', resource: conference).first_or_create(description: 'For the organizers of the conference (who shall have full access)')
Role.where(name: 'cfp', resource: conference).first_or_create(description: 'For the members of the CfP team')
diff --git a/spec/factories/event_types.rb b/spec/factories/event_types.rb
index c68d3fae..9fcc1452 100644
--- a/spec/factories/event_types.rb
+++ b/spec/factories/event_types.rb
@@ -10,6 +10,7 @@
# length :integer default(30)
# maximum_abstract_length :integer default(500)
# minimum_abstract_length :integer default(0)
+# submission_instructions :text
# title :string not null
# created_at :datetime
# updated_at :datetime
@@ -22,6 +23,8 @@ FactoryBot.define do
length { 30 }
minimum_abstract_length { 0 }
maximum_abstract_length { 500 }
+ description { 'Example Event Description' }
+ submission_instructions { 'Example Event Instructions' }
color { '#ffffff' }
program
end
diff --git a/spec/features/base_controller_spec.rb b/spec/features/base_controller_spec.rb
index 6bfd0622..29f60e86 100644
--- a/spec/features/base_controller_spec.rb
+++ b/spec/features/base_controller_spec.rb
@@ -34,31 +34,31 @@ feature 'BaseController' do
expect(flash).to eq 'You are not authorized to access this page.'
end
- it 'an admin he can access the admin area' do
+ it 'an admin they can access the admin area' do
user.is_admin = true
visit admin_conferences_path
expect(current_path).to eq admin_conferences_path
end
- it 'an organizer he can access the admin area' do
+ it 'an organizer they can access the admin area' do
user.role_ids = organizer_role.id
visit admin_conferences_path
expect(current_path).to eq admin_conferences_path
end
- it 'a volunteers_coordinator he can access the admin area' do
+ it 'a volunteers_coordinator they can access the admin area' do
user.role_ids = volunteers_coordinator_role.id
visit admin_conferences_path
expect(current_path).to eq admin_conferences_path
end
- it 'a cfp he can access the admin area' do
+ it 'a cfp they can access the admin area' do
user.role_ids = cfp_role.id
visit admin_conferences_path
expect(current_path).to eq admin_conferences_path
end
- it 'an info_desk he can access the admin area' do
+ it 'an info_desk they can access the admin area' do
user.role_ids = info_desk_role.id
visit admin_conferences_path
expect(current_path).to eq admin_conferences_path
diff --git a/spec/features/event_types_spec.rb b/spec/features/event_types_spec.rb
index 8e05784a..593875dc 100644
--- a/spec/features/event_types_spec.rb
+++ b/spec/features/event_types_spec.rb
@@ -22,6 +22,8 @@ feature EventType do
fill_in 'event_type_title', with: 'Party'
fill_in 'event_type_length', with: '240'
+ fill_in 'event_type_description', with: '**Description**'
+ fill_in 'event_type_submission_instructions', with: '**Instructions**'
fill_in 'event_type_minimum_abstract_length', with: '0'
fill_in 'event_type_maximum_abstract_length', with: '13042'
page.find('#event_type_color').set('#e4e4e4')
@@ -29,11 +31,14 @@ feature EventType do
click_button 'Create Event type'
page.find('#flash')
# Validations
+ # binding.pry
expect(flash).to eq('Event type successfully created.')
within('table#event_types') do
expect(page.has_content?('Party')).to be true
expect(page.has_content?('13042')).to be true
expect(page.has_content?('#E4E4E4')).to be true
+ expect(page.has_content?('Description')).to be true
+ expect(page.has_content?('Instructions')).to be true
expect(page.assert_selector('tr', count: 3)).to be true
end
diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb
index 15c23fcb..e7377bb2 100644
--- a/spec/features/proposals_spec.rb
+++ b/spec/features/proposals_spec.rb
@@ -107,6 +107,17 @@ feature Event do
expect(User.count).to eq(expected_count_user)
end
+ scenario 'edit proposal without cfp' do
+ conference = create(:conference)
+ proposal = create(:event, program: conference.program)
+
+ sign_in proposal.submitter
+
+ visit edit_conference_program_proposal_path(proposal.program.conference.short_title, proposal)
+
+ expect(page).to have_content 'Proposal Information'
+ end
+
scenario 'update a proposal' do
conference = create(:conference)
create(:cfp, program: conference.program)
@@ -136,11 +147,14 @@ feature Event do
select('Example Event Type', from: 'event[event_type_id]')
expect(page).to have_selector(".in[id='#{find_field('event[event_type_id]').value}-help']") # End of animation
+ expect(page).to have_text('Example Event Description')
fill_in 'event_abstract', with: 'Lorem ipsum abstract'
expect(page).to have_text('You have used 3 words')
fill_in 'event_submission_text', with: 'Lorem ipsum submission_text'
- expect(page).to have_text('Submission description')
+ expect(page).to have_text('Submission text')
+ # Submission Instructions content
+ expect(page).to have_text('Example Event Instructions')
click_link 'Do you require something special?'
fill_in 'event_description', with: 'Lorem ipsum description'
@@ -177,5 +191,25 @@ feature Event do
@event.reload
expect(@event.state).to eq('withdrawn')
end
+
+ scenario 'can reset to text template', feature: true, js: true do
+ event_type = conference.program.event_types[-1]
+ event_type.description = 'Example event description'
+ event_type.submission_instructions = '## Fill Me In!'
+ event_type.save!
+
+ sign_in participant
+ visit new_conference_program_proposal_path(conference.short_title)
+
+ fill_in 'event_title', with: 'Example Proposal'
+ select(event_type.title, from: 'event[event_type_id]')
+ fill_in 'event_submission_text', with: 'Lorem ipsum example submission text'
+
+ accept_confirm do
+ click_button 'Reset Submission to Template'
+ end
+
+ expect(page.find('#event_submission_text').value).to eq(event_type.submission_instructions)
+ end
end
end
diff --git a/spec/features/ticket_purchases_spec.rb b/spec/features/ticket_purchases_spec.rb
index 7d6f49ca..cc6b66b5 100644
--- a/spec/features/ticket_purchases_spec.rb
+++ b/spec/features/ticket_purchases_spec.rb
@@ -7,9 +7,29 @@ feature Registration, feature: true, js: true do
let!(:free_ticket) { create(:ticket, price_cents: 0) }
let!(:first_registration_ticket) { create(:registration_ticket, price_cents: 0) }
let!(:second_registration_ticket) { create(:registration_ticket, price_cents: 0) }
- let!(:conference) { create(:conference, title: 'ExampleCon', tickets: [ticket, free_ticket, first_registration_ticket, second_registration_ticket], registration_period: create(:registration_period, start_date: 3.days.ago)) }
+ let!(:third_registration_ticket) { create(:registration_ticket, price_cents: 2000) }
+ let!(:conference) { create(:conference, title: 'ExampleCon', tickets: [ticket, free_ticket, first_registration_ticket, second_registration_ticket, third_registration_ticket], registration_period: create(:registration_period, start_date: 3.days.ago)) }
let!(:participant) { create(:user) }
+ def make_stripe_purchase(card_number = '4242424242424242')
+ find('.stripe-button-el').click
+
+ stripe_iframe = all('iframe[name=stripe_checkout_app]').last
+ sleep(5)
+ Capybara.within_frame stripe_iframe do
+ expect(page).to have_content(:all, "#{ENV['OSEM_NAME']} tickets")
+ fill_in 'Card number', with: card_number
+ fill_in 'Expiry', with: '08/22'
+ fill_in 'CVC', with: '123'
+ click_button '$20.00'
+ sleep(20)
+ end
+ end
+
+ def make_failed_stripe_purchase
+ make_stripe_purchase('4000000000000341')
+ end
+
context 'as a participant' do
before(:each) do
sign_in participant
@@ -21,7 +41,7 @@ feature Registration, feature: true, js: true do
context 'who is not registered' do
- scenario 'purchases and pays for a ticket succcessfully', feature: true, js: true do
+ scenario 'purchases and pays for a ticket succcessfully' do
visit root_path
click_link 'Register'
@@ -38,22 +58,11 @@ feature Registration, feature: true, js: true do
purchase = TicketPurchase.where(user_id: participant.id, ticket_id: ticket.id).first
expect(purchase.quantity).to eq(2)
- if Rails.application.secrets.stripe_publishable_key
- find('.stripe-button-el').click
-
- stripe_iframe = all('iframe[name=stripe_checkout_app]').last
- sleep(5)
- Capybara.within_frame stripe_iframe do
- expect(page).to have_content('book your tickets')
- page.execute_script(%{ $('input#card_number').val('4242424242424242'); })
- page.execute_script(%{ $('input#cc-exp').val('08/22'); })
- page.execute_script(%{ $('input#cc-csc').val('123'); })
- page.execute_script(%{ $('#submitButton').click(); })
- sleep(20)
- end
-
- expect(current_path).to eq(conference_conference_registration_path(conference.short_title))
- expect(page.has_content?("2 #{ticket.title} Tickets for $ 10")).to be true
+ if ENV['STRIPE_PUBLISHABLE_KEY'] || Rails.application.secrets.stripe_publishable_key
+ make_stripe_purchase
+ # expect(current_path).to eq(conference_conference_registration_path(conference.short_title))
+ expect(current_path).to eq(conference_physical_tickets_path(conference.short_title))
+ expect(page).to have_content 'Your ticket is booked successfully.'
end
end
@@ -74,19 +83,8 @@ feature Registration, feature: true, js: true do
purchase = TicketPurchase.where(user_id: participant.id, ticket_id: ticket.id).first
expect(purchase.quantity).to eq(2)
- if Rails.application.secrets.stripe_publishable_key
- find('.stripe-button-el').click
-
- stripe_iframe = all('iframe[name=stripe_checkout_app]').last
- sleep(5)
- Capybara.within_frame stripe_iframe do
- expect(page).to have_content('book your tickets')
- page.execute_script(%{ $('input#card_number').val('4000000000000341'); })
- page.execute_script(%{ $('input#cc-exp').val('08/22'); })
- page.execute_script(%{ $('input#cc-csc').val('123'); })
- page.execute_script(%{ $('#submitButton').click(); })
- sleep(20)
- end
+ if ENV['STRIPE_PUBLISHABLE_KEY'] || Rails.application.secrets.stripe_publishable_key
+ make_failed_stripe_purchase
page.find('#flash')
expect(current_path).to eq(conference_payments_path(conference.short_title))
expect(flash).to eq('Your card was declined. Please try again with correct credentials.')
@@ -111,6 +109,49 @@ feature Registration, feature: true, js: true do
expect(purchase.paid).to be true
end
+ scenario 'purchases a free registartion ticket' do
+ visit root_path
+ click_link 'Register'
+
+ expect(current_path).to eq(new_conference_conference_registration_path(conference.short_title))
+ click_button 'Register'
+
+ fill_in "tickets__#{first_registration_ticket.id}", with: '1'
+ expect(current_path).to eq(conference_tickets_path(conference.short_title))
+
+ click_button 'Continue'
+ expect(current_path).to eq(new_conference_conference_registration_path(conference.short_title))
+ expect(flash).to eq('Thanks! Your ticket is booked successfully. Please register for the conference.')
+
+ purchase = TicketPurchase.where(user_id: participant.id, ticket_id: first_registration_ticket.id).first
+ expect(purchase.quantity).to eq(1)
+ expect(purchase.paid).to be true
+ end
+
+ scenario 'purchases a non-free registartion ticket' do
+ visit root_path
+ click_link 'Register'
+
+ expect(current_path).to eq(new_conference_conference_registration_path(conference.short_title))
+ click_button 'Register'
+
+ fill_in "tickets__#{third_registration_ticket.id}", with: '1'
+ expect(current_path).to eq(conference_tickets_path(conference.short_title))
+
+ click_button 'Continue'
+ page.find('#flash')
+ expect(current_path).to eq(new_conference_payment_path(conference.short_title))
+ expect(flash).to eq('Please pay here to get tickets.')
+ purchase = TicketPurchase.where(user_id: participant.id, ticket_id: third_registration_ticket.id).first
+ expect(purchase.quantity).to eq(1)
+
+ if ENV['STRIPE_PUBLISHABLE_KEY'] || Rails.application.secrets.stripe_publishable_key
+ make_stripe_purchase
+ expect(current_path).to eq(new_conference_conference_registration_path(conference.short_title))
+ expect(page).to have_content 'Your ticket is booked successfully.'
+ end
+ end
+
scenario 'purchases more than one registration tickets of a single type' do
visit root_path
click_link 'Register'
@@ -147,6 +188,7 @@ feature Registration, feature: true, js: true do
context 'who is registered' do
scenario 'unregisters from conference, but ticket purchases dont delete' do
+ skip('SNAPCON: Investigate failure on the unregister button')
visit root_path
click_link 'Register'
@@ -163,22 +205,11 @@ feature Registration, feature: true, js: true do
purchase = TicketPurchase.where(user_id: participant.id, ticket_id: ticket.id).first
expect(purchase.quantity).to eq(2)
- if Rails.application.secrets.stripe_publishable_key
- find('.stripe-button-el').click
-
- stripe_iframe = all('iframe[name=stripe_checkout_app]').last
- sleep(5)
- Capybara.within_frame stripe_iframe do
- expect(page).to have_content('book your tickets')
- page.execute_script(%{ $('input#card_number').val('4242424242424242'); })
- page.execute_script(%{ $('input#cc-exp').val('08/22'); })
- page.execute_script(%{ $('input#cc-csc').val('123'); })
- page.execute_script(%{ $('#submitButton').click(); })
- sleep(20)
- end
-
- expect(current_path).to eq(conference_conference_registration_path(conference.short_title))
- expect(page.has_content?("2 #{ticket.title} Tickets for $ 10")).to be true
+ if ENV['STRIPE_PUBLISHABLE_KEY'] || Rails.application.secrets.stripe_publishable_key
+ make_stripe_purchase
+ # expect(current_path).to eq(conference_conference_registration_path(conference.short_title))
+ expect(current_path).to eq(conference_physical_tickets_path(conference.short_title))
+ expect(page).to have_content 'Your ticket is booked successfully.'
click_button 'Unregister'
end
diff --git a/spec/features/versions_spec.rb b/spec/features/versions_spec.rb
index 17820104..77822cde 100644
--- a/spec/features/versions_spec.rb
+++ b/spec/features/versions_spec.rb
@@ -232,7 +232,7 @@ feature 'Version' do
end
# TODO-SNAPCON: Figure out why this is failing!!
- skip 'display changes in splashpages', feature: true, versioning: true, js: true do
+ xscenario 'display changes in splashpages', feature: true, versioning: true, js: true do
visit admin_conference_splashpage_path(conference.short_title)
click_link 'Create Splashpage'
click_button 'Save Changes'
@@ -247,15 +247,15 @@ feature 'Version' do
uncheck('Display social media links')
check('Make splash page public?')
click_button 'Save Changes'
- splashpage_id = conference.splashpage.id
click_link 'Delete'
page.accept_alert
+ expect(page).to have_text('Splashpage was successfully destroyed')
visit admin_revision_history_path
- expect(page).to have_text("#{organizer.name} created new splashpage with ID #{splashpage_id} in conference #{conference.short_title}")
- expect(page).to have_text("#{organizer.name} updated public, include program, include cfp, include venue, include tickets, include lodgings, include sponsors and include social media of splashpage with ID #{splashpage_id} in conference #{conference.short_title}")
- expect(page).to have_text("#{organizer.name} deleted splashpage with ID #{splashpage_id} in conference #{conference.short_title}")
+ expect(page).to have_text("#{organizer.name} created new splashpage in conference #{conference.short_title}")
+ expect(page).to have_text("#{organizer.name} updated public, include program, include cfp, include venue, include tickets, include lodgings, include sponsors and include social media of splashpage in conference #{conference.short_title}")
+ expect(page).to have_text("#{organizer.name} deleted splashpage in conference #{conference.short_title}")
end
scenario 'displays users subscribe/unsubscribe to conferences', feature: true, versioning: true, js: true do
diff --git a/spec/helpers/conference_helper_spec.rb b/spec/helpers/conference_helper_spec.rb
index 101d083a..4ea48496 100644
--- a/spec/helpers/conference_helper_spec.rb
+++ b/spec/helpers/conference_helper_spec.rb
@@ -67,4 +67,36 @@ describe ConferenceHelper, type: :helper do
expect(sponsorship_mailto(conference)).to match conference.short_title
end
end
+
+ describe '#conference_logo_url' do
+ let(:organization) { create(:organization) }
+ let(:conference2) { create(:conference, organization: organization) }
+
+ it 'gives the correct logo url' do
+ expect(conference_logo_url(conference2)).to eq('snapcon_logo.png')
+
+ File.open('spec/support/logos/1.png') do |file|
+ organization.picture = file
+ end
+
+ expect(conference_logo_url(conference2)).to include('1.png')
+
+ File.open('spec/support/logos/2.png') do |file|
+ conference2.picture = file
+ end
+
+ expect(conference_logo_url(conference2)).to include('2.png')
+ end
+ end
+
+ describe '#conference_color' do
+ let(:conference2) { create(:conference, color: '#000000') }
+
+ it 'gives the correct conference color' do
+ expect(conference_color(conference2)).to eq('#000000')
+
+ conference2.color = ''
+ expect(conference_color(conference2)).to eq('#0B3559')
+ end
+ end
end
diff --git a/spec/mailers/mailbot_spec.rb b/spec/mailers/mailbot_spec.rb
index 1f739997..4c4bd699 100644
--- a/spec/mailers/mailbot_spec.rb
+++ b/spec/mailers/mailbot_spec.rb
@@ -26,6 +26,14 @@ describe Mailbot do
expect(mail.body).to include 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit'
end
+ it 'assigns the email body with the correct color' do
+ expect(mail.body).to include('background-color: ' + conference.color)
+ end
+
+ it 'assigns the email body with the correct logo' do
+ expect(mail.body).to include 'snapcon_logo'
+ end
+
it 'delivers the email' do
expect(ActionMailer::Base.deliveries).to include(mail)
end
diff --git a/spec/models/conference_spec.rb b/spec/models/conference_spec.rb
index f73bd879..64e47003 100755
--- a/spec/models/conference_spec.rb
+++ b/spec/models/conference_spec.rb
@@ -39,6 +39,34 @@
# !/bin/env ruby
require 'spec_helper'
+context 'Delegation' do
+ subject do
+ FactoryBot.create(:conference, start_date: 1.month.from_now, end_date: 2.month.from_now)
+ end
+
+ context 'Venue' do
+ context 'when venue has not been set' do
+ it 'the accessors should be nil' do
+ expect(subject.city).to eq(nil)
+ expect(subject.country_name).to eq(nil)
+ expect(subject.venue_name).to eq(nil)
+ expect(subject.venue_street).to eq(nil)
+ end
+ end
+
+ context 'when venue has been set' do
+ it 'should delegate to venue' do
+ venue = FactoryBot.create(:venue)
+ subject.update(venue: venue)
+ expect(subject.city).to eq(venue.city)
+ expect(subject.country_name).to eq(venue.country_name)
+ expect(subject.venue_name).to eq(venue.name)
+ expect(subject.venue_street).to eq(venue.street)
+ end
+ end
+ end
+end
+
describe Conference do
let(:subject) { create(:conference, start_date: Date.new(2014, 06, 30), end_date: Date.new(2014, 06, 30)) }
diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb
index e2c6f584..030ad382 100644
--- a/spec/models/event_spec.rb
+++ b/spec/models/event_spec.rb
@@ -117,20 +117,6 @@ describe Event do
event.event_type.minimum_abstract_length = 2
end
- context 'is invalid' do
- it 'when submission text is too long' do
- event.submission_text = 'four too many words'
- expect(event.valid?).to eq false
- expect(event.errors[:submission_text]).to eq ['cannot have more than 3 words']
- end
-
- it 'when submission text is too short' do
- event.submission_text = 'word'
- expect(event.valid?).to eq false
- expect(event.errors[:submission_text]).to eq ['cannot have less than 2 words']
- end
- end
-
context 'is valid' do
it 'when submission text is within limts' do
event.abstract = 'the magic three'
diff --git a/spec/models/event_type_spec.rb b/spec/models/event_type_spec.rb
index 2cfc57be..a9d064c8 100644
--- a/spec/models/event_type_spec.rb
+++ b/spec/models/event_type_spec.rb
@@ -10,6 +10,7 @@
# length :integer default(30)
# maximum_abstract_length :integer default(500)
# minimum_abstract_length :integer default(0)
+# submission_instructions :text
# title :string not null
# created_at :datetime
# updated_at :datetime
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index b1a9de71..2e890949 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -441,6 +441,19 @@ describe User do
end
end
end
+
+ describe '#count_registration_tickets' do
+ let(:registration_ticket) { create(:registration_ticket, price_cents: 0) }
+ let(:conference3) { create(:conference, short_title: 'oSC17', title: 'openSUSE Conference 2017', tickets: [registration_ticket]) }
+ let(:ticket_purchase) { create(:ticket_purchase, user: user, conference: conference3, ticket: registration_ticket, quantity: 1) }
+
+ it 'counts the number of registration tickets of a conference held by user' do
+ user.ticket_purchases << ticket_purchase
+
+ expect(user.count_registration_tickets(conference3)).to eq(1)
+ expect(user.count_registration_tickets(conference2)).to eq(0)
+ end
+ end
end
describe 'rolify' do
@@ -480,7 +493,7 @@ describe User do
end
describe 'assigns admin attribute' do
- it 'to second user when first user is deleted_user' do
+ xit 'to second user when first user is deleted_user' do
deleted_user = User.find_by(email: 'deleted@localhost.osem')
expect(deleted_user.is_admin).to be false
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 239e1802..2d680fb2 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -3,9 +3,9 @@
# This file is copied to spec/ when you run 'rails generate rspec:install'
require 'simplecov'
-if ENV['TRAVIS']
- require 'codecov'
- SimpleCov.formatter = SimpleCov::Formatter::Codecov
+if ENV['GITHUB_ACTIONS'] || ENV['TRAVIS']
+ require 'simplecov-cobertura'
+ SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
end
SimpleCov.start 'rails'