Commit graph

898 commits

Author SHA1 Message Date
Michael Ball
b099246f78 delinting...space.... 2021-04-17 17:45:55 -07:00
Michael Ball
59f534a010 fix hash style 2021-04-17 17:33:59 -07:00
Michael Ball
4c056f208e Delinting 2021-04-17 17:29:58 -07:00
Michael Ball
5a3012f0b7 Add comiittee_review(_html) options to email spec 2021-04-17 17:08:16 -07:00
Michael Ball
4dedfdfe90 Merge branch 'master' of github.com:snap-cloud/snapcon
* 'master' of github.com:snap-cloud/snapcon:
  Skip datatable spec because github actions is weird.
  Add devise view files for email messages
  Make the _mailbot_* files not depend on @conference
  Tweak devise text for confirm emails
2021-04-15 22:22:23 -07:00
Michael Ball
68004c842e
Merge pull request #138 from snap-cloud/confirmation-email-update
Improve the Account Confirmation Email
2021-04-15 22:18:23 -07:00
Michael Ball
d4ffda5d58 merge master 2021-04-15 21:56:18 -07:00
Michael Ball
c0a086862a Skip datatable spec because github actions is weird. 2021-04-15 20:32:21 -07:00
CactusPuppy
d6fe38bb2c
Merge branch 'master' into 176895554/mailbluster 2021-04-12 15:27:20 -07:00
kingdish
41a0193ad3
Merge pull request #45 from CactusPuppy/177261601-embed-happening-now-events-in-conference-splashpage
Embed happening now events in conference splashpage
2021-04-12 13:38:29 +08:00
CactusPuppy
34ac979109
Fix spec that was not updated with update to delete_lead 2021-04-09 11:53:54 -07:00
CactusPuppy
ce90dc5fc2
Add spec for query_api method 2021-04-07 14:50:34 -07:00
CactusPuppy
9361f0bfd5
Remove redundant comments 2021-04-07 14:50:33 -07:00
CactusPuppy
66c2728998
Fix Rubocop linting issues 2021-04-07 14:50:29 -07:00
CactusPuppy
f0582c25bf
Move Mailbluster business logic to services/ instead of helpers/ 2021-04-07 14:50:28 -07:00
Ziyi
560a3dbe70
CAUTION: deleted user model spec for mailbluster 2021-04-07 14:50:26 -07:00
CactusPuppy
e620dadc1c
Fix some RSpec issues 2021-04-07 14:50:26 -07:00
CactusPuppy
2f9b3feabc
Fix Rubocop linting 2021-04-07 14:50:24 -07:00
Ziyi
c2b9275e02
Spec for delete_lead WIP 2021-04-07 14:50:24 -07:00
CactusPuppy
58f130c132
Fix Rubocop linting issues 2021-04-07 14:50:24 -07:00
CactusPuppy
d75ba79b3d
Fix up RSpec tests 2021-04-07 14:50:23 -07:00
CactusPuppy
5ff93061d9
Properly stub MailBluster calls in FactoryBot user creation 2021-04-07 14:50:23 -07:00
Ziyi
f98f35ec8d
Called create_lead in model, FactoryBot errors 2021-04-07 14:50:22 -07:00
CactusPuppy
09becbc3e0
Prepare to add edit_lead spec 2021-04-07 14:50:22 -07:00
CactusPuppy
bbad082c21
Match actually used URL in helper 2021-04-07 14:50:22 -07:00
CactusPuppy
59cc57ebf8
Use OSEM_NAME if available 2021-04-07 14:50:21 -07:00
CactusPuppy
0f6881414b
Fix up spec to properly pass under expectations 2021-04-07 14:50:21 -07:00
Ziyi
125c17838c
delete_lead WIP 2021-04-07 14:50:20 -07:00
CactusPuppy
fddd6ecd9f
Add spec for deleting leads 2021-04-07 14:50:20 -07:00
CactusPuppy
59908e60e4
Fix rubocop complaints 2021-04-07 14:50:19 -07:00
Ziyi
340865ddbd
Put user.variables in Mailbluster create test 2021-04-07 14:50:18 -07:00
CactusPuppy
f686f05710
Make return stub value more accurate 2021-04-07 14:50:18 -07:00
CactusPuppy
bad73c5d8b
Get WebMock matchers to work 2021-04-07 14:50:18 -07:00
Ziyi
209d848079
Test mailbluster request body 2021-04-07 14:50:17 -07:00
CactusPuppy
d99487b19c
Start setting up WebMock to stub responses 2021-04-07 14:50:17 -07:00
Ziyi
cc57973103
Fixed spec @user 2021-04-07 14:50:16 -07:00
Ziyi
5500fc8acf
Init create_lead, fix MailblusterHelper name 2021-04-07 14:50:16 -07:00
CactusPuppy
27baa935c1
Begin writing tests for Mailbluster API calls 2021-04-07 14:50:09 -07:00
CactusPuppy
8f48edf897
Prevent working test from causing failure, since Travis and Github Actions fail differently 2021-04-07 13:49:39 -07:00
CactusPuppy
09298ed38e
Properly pend outputs context 2021-04-07 13:21:37 -07:00
Jimmy
27f83ddd18 Merge branch 'master' into 177261601-embed-happening-now-events-in-conference-splashpage 2021-04-08 04:04:12 +08:00
Jimmy
2e7bcf255c [style]Fix style in user_datatable_spec 2021-04-08 03:40:27 +08:00
Jimmy
acb48e9230 [fix]Revert github workflow; Change datatable tests to pending 2021-04-08 03:30:32 +08:00
Jimmy
65119149ea [feat]Add include_happening_now checkbox to the admin splashpage 2021-04-01 13:14:31 +08:00
Jimmy
4aab0539b5 [feat] Add include_happening_now field to splashpages table 2021-04-01 13:08:09 +08:00
Jimmy
c3167a3503 [feat] Happening now JSON endpoint contains rendered abstract of event; Add corresponding tests 2021-03-31 17:35:25 +08:00
Jimmy
e2f5b5e933 Merge master 2021-03-31 07:49:30 +08:00
Jimmy
0ede07dfaa [fix] Use let in schedules_controller_spec; revert changes in event_schedule#happening_now? 2021-03-31 07:45:26 +08:00
Michael Ball
82e45fff0a fix typo in spec 2021-03-24 02:28:43 -07:00
Michael Ball
e810fd442f Cleanup the submission form, fix reset button 2021-03-23 23:06:34 -07:00