Commit graph

330 commits

Author SHA1 Message Date
Michael Ball
d4a2861051 Improve Registration Flow Some:
* Trying to register when a ticket is required will now redirect you to buy tickets.
* #64 will then redirect you back to complete the registration
2021-02-23 18:17:45 -08:00
Michael Ball
62dd99b263 Fix cfp spec to use "Materials" instead of Commercials 2021-02-23 17:17:17 -08:00
Michael Ball
2892a56a1c merge master 2020-12-04 01:17:39 -08:00
Hiroshi SHIBATA
ae98ac1430
Fixed some typos (#2695)
* Fix typos
2020-10-30 11:06:43 +02:00
Michael Ball
0877aadb2e Merge some contributor fixes 2020-06-30 00:48:47 -07:00
Andrew Kvalheim
0618f93660 Merge #​2662 "Fix bug in test of animated form" 2020-06-26 20:19:37 -07:00
Andrew Kvalheim
943f0afaaf Merge #​2659 "Use Rails transactional tests" 2020-06-26 20:19:36 -07:00
Michael Ball
0b9b100bf3 Merge master 2020-06-02 01:59:54 -07:00
Andrew Kvalheim
e077fe9671 Fix bug in test of animated form
The help text for the event type field is animated using a technique
unaffected by `Capybara.disable_animation`. Wait for the animation.

Resolves: #2356
Works around: #2661
2020-04-12 13:40:49 -07:00
Andrew Kvalheim
ae00a7f055 Use Rails transactional tests
As of Rails 5.1:

  - Rails has built-in support for running tests within database
    transactions, so Database Cleaner is no longer needed for this.
  - Rails automatically shares the database connection across threads,
    so transactional_capybara is no longer needed.

Changes:

  - Enable `use_transactional_tests`.
  - Remove transactional_capybara.
  - Remove the Database Cleaner test wrapper.

This resolves:

  - transactional_capybara mismanages the shared database connection,
    causing the connection to falsely report as idle after the first
    test. At 6 minutes (idle_timeout + reaping_frequency) into testing,
    the connection is closed, causing e.g. `PG::ConnectionBad` errors.
2020-04-05 13:15:12 -07:00
Andrew Kvalheim
71d9860124 Test access to organization_admin version as organization_admin
This corrects the specification for the behavior of the Revision History
screen; changes to the organization administrator role should be
accessible to organization administrators, not conference organizers.
2020-04-03 15:35:44 -07:00
Andrew Kvalheim
aa61ec9692 Remove unused code 2020-04-03 15:35:25 -07:00
Andrew Kvalheim
a7006a4edd Decouple tests from unspecified data ordering
These tests have been passing with SQLite, but don't reflect guaranteed
behavior and with PostgreSQL failed intermittently.
2020-03-28 15:15:01 -07:00
Michael Ball
be991c53d3 Merge branch 'master' of github.com:snap-cloud/snapcon into admin-ticketing
* 'master' of github.com:snap-cloud/snapcon: (22 commits)
  Cleanup some Auth specs and weird haml syntax
  add sentry puma hooks
  fix user model spec
  Tweak Tickets Text
  fix missing ]
  Fix specs for omniauth providers?
  Update stripe mock gem
  remove airbrake
  Add sentry logging
  Update stripe gem
  Cleanup stripe stuff
  Fix the docker init script
  Cleanup specs
  Cleanup config file, ensure providers are set if present
  Fix format spec with new markdown options
  Try to update spec file with image in navbar
  Delint
  Delint helpers
  Lint: Sort gems
  Update user model spec
  ...
2020-02-06 02:02:20 -08:00
Michael Ball
4306fbe636 Merge branch 'master' into admin-ticketing
* master: (61 commits)
  Replace more Commercials with Materials
  Rename more commericals to materials
  UI -- Repalce "Commerials" with "Materials".
  Re-order Conference Associations
  Cleanup CSS add Snap! style block attachments
  hide venue link if there is no venue link
  No dropshadow
  Text with drop shadow for now
  Tidy up the look of lodging panels
  Show reg status for tickets.
  Tweak CSS, fix loding order
  Move the venue description to below the map.
  Update lodging styling. Add description for venu when map is shown.
  CSS tweaks...
  Make the edit form not so wide.
  Support markdown in more fields
  Cleanup CSS ordering, fix coloring for navdropdowns
  dumb...fix order of link_to args
  ARRRGHHH, another typo...same line...
  fix typo
  ...
2020-02-06 01:37:38 -08:00
Michael Ball
7586112f72 Merge master 2020-02-06 01:20:11 -08:00
Michael Ball
37ffc1765d Fix specs for omniauth providers? 2020-02-04 23:50:28 -08:00
Michael Ball
daba37a116 Merge branch 'master' into fix-build
* master:
  Replace more Commercials with Materials
  Rename more commericals to materials
  UI -- Repalce "Commerials" with "Materials".
2020-02-04 18:10:29 -08:00
Michael Ball
7bf57b05f3 Cleanup specs 2020-01-29 16:51:27 -08:00
Michael Ball
8a6bb87983 Replace more Commercials with Materials 2020-01-27 13:40:36 -08:00
Michael Ball
3eeaebbdc8 Rename more commericals to materials 2020-01-27 13:37:23 -08:00
cyrille
35ec178beb Create a factory for organizer
Refactor organizer user creation in tests

Fixes https://github.com/openSUSE/osem/issues/2398
2019-03-18 23:16:15 +01:00
Ana María Martínez Gómez
52d0ff3b3e
Fix flickering submit valid proposal test
The `find` was added to try to fix the flickering test: ac3337b

`find` and `fill_in` have the same `default_max_wait_time`, so didn't
change the problem.

The reason why this fails sometimes is that the Javascript for the
description (for the text editor) moves the 'Do you require something
special?' link a bit down. This causes that the link is not actually
clicked if capybara found it before it moved. Ensuring that the link is
searched after the description has been introduced solves the problem.

Finally fixes https://github.com/openSUSE/osem/issues/2356

Co-authored-by: Stephan Kulow <stephan@kulow.org>
2019-03-15 14:49:36 +01:00
Rahul
51b6606279 Fix test for picktime
Fix tests for https://github.com/openSUSE/osem/pull/2391
2019-03-09 01:47:33 +05:30
Ana María Martínez Gómez
ae53fe86f1
Replace cfps feature tests by controller tests
It doesn't make sense to test this with a feature test as it is just
testing that the controller actions work properly. Moreover, there are
problems with updating datapickers in feature tests. I reported those
problems upstream:

https://github.com/TrevorS/bootstrap3-datetimepicker-rails/issues/66
https://github.com/akarzim/capybara-bootstrap-datepicker/issues/14
2019-03-07 12:09:14 +01:00
Henne Vogelsang
918eb91549 Adopt spec to changes in the messages 2019-02-19 21:57:20 +01:00
James Mason
072116fffe Enable registration to proceed without requiring a ticket.
Requiring a ticket after registration is convoluted; while it may be neccesary
for some workflows, it definitely isn't for others, and the core of osem
doesn't need it... so let's make it optional.
2019-02-16 00:53:40 +01:00
James Mason
3607854b5e
Run some features headless #BetterPlace 2018-12-28 17:55:55 -08:00
James Mason
6f671b3933
Admins can give tickets.
(cherry picked from commit aeeeb8e331673011842a35946a1bdba2611f901e)
2018-12-28 17:55:54 -08:00
James Mason
26f0377c76
Add (admin-only) tickets via 'visibile' attribute [migration]
(cherry picked from commit ce0db3d7a736e7bcde480721986dbfb4a82aa083)
2018-12-28 16:54:02 -08:00
James Mason
03f7951676 Add a switch for allowing registration on events (proposals) 2018-12-19 13:18:24 -08:00
James Mason
e518431b8e Rename 'Call for Papers' to 'Calls for Content' 2018-12-19 13:18:24 -08:00
James Mason
21c5b842b1 Unlint CfP views #BetterPlace 2018-12-19 13:18:24 -08:00
James Mason
ac3337bd1e Fix up a flappy test 2018-11-30 14:09:10 -08:00
James Mason
0a5246388f Adapt tests to new, pickier Capybara 2018-11-19 15:10:14 -08:00
James Mason
a9e8498abe transactional db support for capybara tests! 2018-11-19 08:40:55 -08:00
James Mason
1b9a12746d Fix up test failures in Chrome & Firefox 2018-11-19 08:40:55 -08:00
James Mason
43bef689fc Rubocop autocorrections 2018-11-16 09:06:05 -08:00
James Mason
a3adf8318d Add additional social media fields to contacts
+ YouTube
+ Blog

Simplify logic in the view, and refactor the test #BetterPlace
2018-11-14 15:01:03 +01:00
James Mason
b11001cdba Every campaign has an end.
Drop ahoy, because it's more trouble than it's worth. This means dropping
visits, campaigns, targets.

Campaigns are better run to analytics, such as:
* https://matomo.org/docs/tracking-campaigns/
* https://matomo.org/docs/tracking-goals-web-analytics/
* https://support.google.com/analytics/answer/1012040?hl=en
2018-10-16 21:34:04 +02:00
Tyrant Davis
d3ce401cba Indicate if spalshpage is marked as public or not. 2018-08-29 21:28:20 -07:00
James Mason
d8bd269a64 Add frozen_string_literal magic comment
re: https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Style/FrozenStringLiteralComment
2018-06-01 09:15:57 -07:00
James Mason
6d31dfeef4 Add frozen_string_literal magic comment
re: https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Style/FrozenStringLiteralComment
2018-05-09 06:54:26 -07:00
James Mason
03ef28e74d Require code of conduct acceptance on registration 2018-05-08 13:23:00 +02:00
James Mason
95196c7f80 Include code of conduct on conference 2018-05-08 13:23:00 +02:00
James Mason
217ec1a46f Show code of conduct on organizations 2018-05-08 13:23:00 +02:00
James Mason
a6daff8582 Add/edit org code of conduct, as admin 2018-05-08 13:23:00 +02:00
James Mason
98defe2d0f Use role caching for Rolify to avoid N+1 queries
Resolves #2018

See https://github.com/RolifyCommunity/rolify#cached-roles-to-avoid-n1-issue
2018-04-04 07:36:29 -07:00
Michael Klimenko
297447d802 Make factories and tests timezone-friendly 2018-03-28 08:32:45 -07:00
James Mason
ad19a6d753 Use helpers for repeated event dropdown links 2018-03-14 18:00:37 -07:00