Commit graph

4093 commits

Author SHA1 Message Date
Rune Antonsen
9c904f1103
bump ruby version to 3.1.2 2022-04-21 14:12:37 +02:00
Henne Vogelsang
f17fab82d2
Merge pull request #2982 from hellcp/patch-1
Don't include speaker information if it's nil
2022-04-19 15:10:54 +02:00
Sasi Olin
7bbac4b599
Update app/views/conferences/_highlights.haml
Co-authored-by: Henne Vogelsang <hvogel@opensuse.org>
2022-04-19 13:16:50 +02:00
Sasi Olin
01bb991d46
Update app/views/conferences/_highlights.haml
Co-authored-by: Henne Vogelsang <hvogel@opensuse.org>
2022-04-19 13:16:45 +02:00
Sasi Olin
7f1162ea35
Don't include speaker information if it's nil 2022-04-16 15:04:27 +02:00
Henne Vogelsang
dbb7cc11f7
Merge pull request #2981 from openSUSE/depfu/update/nokogiri-1.13.4
🚨 [security] Update nokogiri: 1.13.3 → 1.13.4 (patch)
2022-04-12 13:13:13 +02:00
depfu[bot]
4d72a3ada7
Update nokogiri to version 1.13.4 2022-04-12 00:29:00 +00:00
Henne Vogelsang
540d952953
Merge pull request #2980 from hennevogel/bugfix/deploy-restart
Fix restart during deploy
2022-04-11 12:49:01 +02:00
Henne Vogelsang
c36343cda3
Fix restart during deploy
pumactl restart does not make the worker re-read their
working directory. Hence new code is never used...

Use stop/start via systemd again.
2022-04-08 15:19:14 +02:00
Henne Vogelsang
18391e0983
Merge pull request #2979 from openSUSE/depfu/update/puma-5.6.4
🚨 [security] Update puma: 5.6.2 → 5.6.4 (patch)
2022-04-04 12:21:42 +02:00
depfu[bot]
fe1e464c72
Update puma to version 5.6.4 2022-04-01 16:16:43 +00:00
Henne Vogelsang
e434c99147
Merge pull request #2978 from hellcp/master
Fix the test failures
2022-03-30 13:39:11 +02:00
Sasi Olin
e85ecede4c Fix the test failures 2022-03-30 12:39:01 +02:00
Henne Vogelsang
50e876dd6f
Merge pull request #2976 from AndrewKvalheim/bootstrap-switch
Avoid bug in which switches always display “No”
2022-03-29 16:12:33 +02:00
Henne Vogelsang
0839337551
Merge pull request #2974 from AndrewKvalheim/email-settings-labels
Minor corrections to the form labels in email settings
2022-03-29 15:20:51 +02:00
Henne Vogelsang
6601cb2b1e
Merge pull request #2973 from AndrewKvalheim/word-count-events
Remove excessive word counts
2022-03-29 15:19:42 +02:00
Henne Vogelsang
d471d9eb23
Merge pull request #2972 from AndrewKvalheim/ajax-datatables-rails-1_part-2
Update datatables for ajax-datatables-rails 1
2022-03-29 15:15:10 +02:00
Henne Vogelsang
c3dfd7645a
Merge pull request #2971 from AndrewKvalheim/chart-colors
Restore `colors` parameter of donut chart partial
2022-03-29 15:14:09 +02:00
Henne Vogelsang
85cae7d093
Merge pull request #2970 from AndrewKvalheim/safe_links_only
Correct use of Redcarpet’s `safe_links_only` flag
2022-03-29 15:11:58 +02:00
Henne Vogelsang
db22aa27a0
Merge pull request #2969 from AndrewKvalheim/test-survey-create-and-respond
Basic feature test of survey creation and response
2022-03-29 15:07:10 +02:00
Andrew Kvalheim
654a02479d Downgrade bootstrap-switch-rails: 3.3.5 → 3.3.3
bootstrap-switch 3.3.4 and 3.3.5 are affected by Bttstrp/bootstrap-switch#707
2022-03-21 17:22:34 -07:00
Andrew Kvalheim
9738d2990c Correct and complete form labels in email settings
Changes:

  - restoration of labels that were formerly generated by Formtastic
  - corrections to markup of HTML labels and Bootstrap form controls
  - minor copy editing
2022-03-21 15:34:04 -07:00
Andrew Kvalheim
9de2cba061 Remove excessive word counts
Resolves:

  - Duplicate event listeners are registered during every word count,
    increasing the number of word counts until the browser becomes
    unresponsive.
  - The word count is triggered multiple times on input due to listening
    to redundant events.
2022-03-18 20:52:33 -07:00
Andrew Kvalheim
2a93d09d22 Update datatables for ajax-datatables-rails 1
Resolves:

  - inability to filter, order, or paginate datatables
  - exception AjaxDatatablesRails::Error::InvalidSearchColumn

Continues:

  - 81853d1ef9
  - 83636afee0
2022-03-18 12:49:30 -07:00
Andrew Kvalheim
edec5a98be Removed unused data and columns from datatables 2022-03-18 12:48:18 -07:00
Andrew Kvalheim
ef298f5a22 Restore colors parameter of donut chart partial
This parameter was accidentally disconnected in commit c967a0b9a4
but is still used by `app/views/admin/conferences/index.html.haml` and
`app/views/admin/events/index.html.haml`.
2022-03-17 18:46:04 -07:00
Andrew Kvalheim
685d79e44b Correct use of Redcarpet’s safe_links_only flag 2022-03-17 17:03:30 -07:00
Andrew Kvalheim
a281110b29 Add test of markdown link protocol sanitization 2022-03-17 16:44:27 -07:00
Andrew Kvalheim
e486ce55d7 Remove test of implementation details 2022-03-17 16:13:47 -07:00
Andrew Kvalheim
02dc5011fe Show feedback upon survey response
Resolves:

    Failures:

      1) Survey as an attendee respond to a survey during registration
         Failure/Error: expect(flash).to eq('Successfully responded to survey.')

           expected: "Successfully responded to survey."
                got: "none"

           (compared using ==)
         # ./spec/features/surveys_spec.rb:49:in `block (3 levels) in <top (required)>'

    Failed examples:

    rspec ./spec/features/surveys_spec.rb:37 # Survey as an attendee respond to a survey during registration
2022-03-16 14:12:01 -07:00
Andrew Kvalheim
b565be2f46 Correct assumption of survey start and end dates
The logic used for the `:reply` ability incompletely duplicated that of
`Survey#active?` and incorrectly assumed that surveys always have start
and end dates.

Resolves:

    Failures:

      1) Survey as an attendee respond to a survey during registration
         Failure/Error: survey.start_date > Time.current || survey.end_date < Time.current

         ActionView::Template::Error:
           undefined method `>' for nil:NilClass

                 survey.start_date > Time.current || survey.end_date < Time.current
                                   ^
         # ./app/models/ability.rb:126:in `block in signed_in'
         # ./app/views/surveys/show.html.haml:28:in `block in _app_views_surveys_show_html_haml___3404959267043700678_138180'
         # ./app/views/surveys/show.html.haml:19:in `_app_views_surveys_show_html_haml___3404959267043700678_138180'

    Failed examples:

    rspec ./spec/features/surveys_spec.rb:37 # Survey as an attendee respond to a survey during registration
2022-03-16 14:12:01 -07:00
Andrew Kvalheim
3e7be52586 Associate form label with its control
Resolves:

    Failures:

      1) Survey as an organizer create a survey
         Failure/Error: select 'boolean', from: 'Type of Question:', visible: false # Hidden by bootstrap-select

         Capybara::ElementNotFound:
           Unable to find select box "Type of Question:" that is not disabled and Unable to find input box with datalist completion "Type of Question:" that is not disabled
         # ./spec/features/surveys_spec.rb:24:in `block (3 levels) in <top (required)>'
         # ------------------
         # --- Caused by: ---
         # Capybara::ElementNotFound:
         #   Unable to find select box "Type of Question:" that is not disabled
         #   ./spec/features/surveys_spec.rb:24:in `block (3 levels) in <top (required)>'

    Failed examples:

    rspec ./spec/features/surveys_spec.rb:15 # Survey as an organizer create a survey
2022-03-16 14:12:01 -07:00
Andrew Kvalheim
d1a0167969 Correct failure to enable survey date pickers
Resolves:

    app/views/admin/surveys/_form.html.haml:25: warning: key :class is duplicated and overwritten on line 25
    app/views/admin/surveys/_form.html.haml:27: warning: key :class is duplicated and overwritten on line 27
2022-03-16 14:09:36 -07:00
Andrew Kvalheim
58b1440cdd Add missing view for survey question creation
Resolves:

    Failures:

      1) Survey as an organizer create a survey
         Failure/Error: raise ActionController::MissingExactTemplate, message

         ActionController::MissingExactTemplate:
           Admin::SurveyQuestionsController#new is missing a template for request formats: text/html
         # <internal:kernel>:90:in `tap'

    Failed examples:

    rspec ./spec/features/surveys_spec.rb:15 # Survey as an organizer create a survey
2022-03-16 13:37:00 -07:00
Andrew Kvalheim
c052516009 Grant conference organizers permission to manage surveys
Resolves:

    Failures:

      1) Survey as an organizer create a survey
         Failure/Error: click_link 'New'

         Capybara::ElementNotFound:
           Unable to find link "New"
         # ./spec/features/surveys_spec.rb:18:in `block (3 levels) in <top (required)>'

    Failed examples:

    rspec ./spec/features/surveys_spec.rb:15 # Survey as an organizer create a survey
2022-03-16 13:37:00 -07:00
Andrew Kvalheim
51e65003bd Add failing tests for survey creation and response
Removes optional attributes from default survey factory.
2022-03-16 13:37:00 -07:00
Henne Vogelsang
ed8a2696bb
Merge pull request #2968 from AndrewKvalheim/unskip-tests
Re-enable skipped tests
2022-03-15 17:14:45 +01:00
Henne Vogelsang
83a6313496
Merge pull request #2967 from AndrewKvalheim/splashpage-versions-test
Restore test of splashpage revision history
2022-03-15 17:13:56 +01:00
Andrew Kvalheim
7e9ce60293 Partially revert "Skip some failing specs..."
This reverts the skipping of tests by commit b688d353ac in:

  - `spec/models/user_spec.rb`
  - `spec/controllers/admin/users_controller_spec.rb`
  - `spec/datatables/user_datatable_spec.rb`
2022-03-08 17:18:34 -08:00
Andrew Kvalheim
4b9eb440f4 Partially revert "Skip some failing specs..."
This reverts the changes to `spec/features/versions_spec.rb` made in
commit b688d353ac, except for the change
that was proposed in issue #2703.
2022-03-08 16:26:29 -08:00
Henne Vogelsang
af657ca77f
Merge pull request #2964 from AndrewKvalheim/splashpage-form-test
Update tests of splashpage forms
2022-03-08 13:24:08 +01:00
Henne Vogelsang
b04ad33138
Merge pull request #2963 from AndrewKvalheim/ajax-datatables-rails-1
Update UserDatatable for ajax-datatables-rails 1
2022-03-08 13:22:33 +01:00
Henne Vogelsang
5c7c75b53c
Merge pull request #2962 from AndrewKvalheim/countries-4.2
Update venue country name for Countries 4.2
2022-03-08 13:21:45 +01:00
Henne Vogelsang
9da3bf9337
Merge pull request #2965 from AndrewKvalheim/users-role-versions
Fix bug in which role assignments aren’t tracked in version history
2022-03-08 13:21:04 +01:00
Andrew Kvalheim
e2bc6fc1c7 Fix bug in which role assignments aren’t tracked in version history
Resolves failing test `spec/features/versions_spec.rb:344`:

    1) Version display changes in users_role for conference role
       Failure/Error: expect(page).to have_text("added role cfp with ID #{user_role.id} to user #{user.name} in conference #{conference.short_title}")
         expected to find text "added role cfp with ID 2 to user name2 in conference fr_GAQ" in "OSEM\nname1\nAll Conferences\nOrganizations\nRevision History\nAll Conferences\nRevision History\nLog of changes made to conferences and associated resources\nShow\n10\n25\n50\n100\nAll\nentries\nSearch:\nID Description Actions\n18\nname2 signed up less than a minute ago\n(May 1, 2014 00:01)\n\n\n\nView Changes\nRevert\n17\nSomeone (probably via the console) updated is admin of user name1 less than a minute ago\n(May 1, 2014 00:01)\n\n\n\nView Changes\nRevert\n16\nname1 signed up less than a minute ago\n(May 1, 2014 00:01)\n\n\n\nView Changes\nRevert\n15\nSomeone (probably via the console) created new cfp for events in conference fr_GAQ less than a minute ago\n(May 1, 2014 00:01)\n\n\n\nView Changes\nRevert\n14\nSomeone (probably via the console) created new role volunteers_coordinator in conference fr_GAQ less than a minute ago\n(May 1, 2014 00:01)\n\n\n\nView Changes\nRevert\n13\nSomeone (probably via the console) created new role info_desk in conference fr_GAQ less than a minute ago\n(May 1, 2014 00:01)\n\n\n\nView Changes\nRevert\n12\nSomeone (probably via the console) created new role cfp in conference fr_GAQ less than a minute ago\n(May 1, 2014 00:01)\n\n\n\nView Changes\nRevert\n11\nSomeone (probably via the console) created new role organizer in conference fr_GAQ less than a minute ago\n(May 1, 2014 00:01)\n\n\n\nView Changes\nRevert\n10\nSomeone (probably via the console) created new difficulty level Hard in conference fr_GAQ less than a minute ago\n(May 1, 2014 00:01)\n\n\n\nView Changes\nRevert\n9\nSomeone (probably via the console) created new difficulty level Medium in conference fr_GAQ less than a minute ago\n(May 1, 2014 00:01)\n\n\n\nView Changes\nRevert\nShowing 1 to 10 of 16 entries\nFirst\nPrevious\n1\n2\nNext\nLast\nThis tool is free software, released under the MIT license. You can run, copy, distribute, study, change and improve it. The source code and the developers are on GitHub."
       # ./spec/features/versions_spec.rb:350:in `block (2 levels) in <top (required)>'
2022-03-06 23:38:42 -08:00
Andrew Kvalheim
4403f1149d Update tests of splashpage forms
The splashpage forms and default configuration changed in 81853d1ef9.
2022-03-06 23:28:58 -08:00
Andrew Kvalheim
83636afee0 Update UserDatatable for ajax-datatables-rails 1
Resolves failing test `spec/datatables/user_datatable_spec.rb:97`:

    1) UserDatatable outputs recordsTotal
       Failure/Error: filter_records(fetch_records).unscope(:group, :select).count(:all)

       NotImplementedError:
         NotImplementedError
       # ./app/datatables/user_datatable.rb:59:in `records_filtered_count'
       # ./spec/datatables/user_datatable_spec.rb:95:in `block (3 levels) in <top (required)>'
       # ./spec/datatables/user_datatable_spec.rb:98:in `block (3 levels) in <top (required)>'

Details: https://github.com/jbox-web/ajax-datatables-rails/blob/v1.3.1/doc/migrate.md#to-migrate-from-v04x-to-v100

RegistrationDatatable has already been updated in 81853d1ef9.
2022-03-06 23:12:02 -08:00
Andrew Kvalheim
a179609773 Update venue country name for Countries 4.2
Resolves:

    DEPRECATION WARNING: The Country#name method has been deprecated.
    Please use Country#iso_short_name instead or refer to the README
    file for more information on this change.

Details: https://github.com/countries/countries/blob/v4.2.2/README.markdown#upgrading-to-42-and-5x
2022-03-06 23:05:29 -08:00
Henne Vogelsang
a675399eb8
Merge pull request #2961 from hennevogel/feature/deploy-hot-restart
Use pumactl to "hot" restart
2022-03-03 17:55:57 +01:00
Henne Vogelsang
dffc5c1240
Updates puma to 5.6.2 (was 4.3.11)
Also use pumactl to "hot" restart
2022-03-03 17:45:58 +01:00