Commit graph

4600 commits

Author SHA1 Message Date
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
803c98b158
Ensure Mailbluster helper methods actually correctly cause changes in the end service 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
CactusPuppy
4db96208e8
Refactor Mailbluster API URL into a constant 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
c6c2c4e264
Merge pull request #50 from CactusPuppy/pend-instead-of-skip-datatables
Properly pend outputs context
2021-04-07 14:16:02 -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
kingdish
fd3d7f565f
Merge pull request #46 from CactusPuppy/fix-ci-4-7-21
Fix CI. Skip datatable tests.
2021-04-07 12:55:07 -07: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
065466e6d1 fix syntax 2021-04-08 00:52:02 +08:00
Jimmy
a397a03721 try again 2021-04-08 00:49:13 +08:00
Jimmy
1dd43fa323 try ignoring datatables 2021-04-08 00:31:13 +08:00
Jimmy
dd9d2e1b93 try running rspec instead of rake 2021-04-08 00:24:36 +08:00
Jimmy
103dccc59e ignore user datatable 2021-04-08 00:05:07 +08:00
Jimmy
2d9622ed22 [style]Fix order of gem 2021-04-07 23:26:05 +08:00
Jimmy
680979f1d1 [fix]Fix ruby version and update mimemagic 2021-04-07 23:22:40 +08:00
Jimmy
db8e292490 temp 2021-04-07 23:18:51 +08:00
Jimmy
8b6d70b73c [fix]Fix trapezoid on splashpage 2021-04-07 22:50:27 +08:00
Jimmy
04455bbbdf [feat]Add md lg view for happening_now column 2021-04-07 18:55:34 +08:00
Jimmy
7d51ff9eb4 [feat]Display description and happening now in two columns; display happening now first in sm view 2021-04-07 17:55:20 +08:00
Jimmy
9e2c78e236 [style]Fix style 2021-04-07 11:13:41 +08:00
Jimmy
4abcc57d7b [feat]Add a title for happening now section in splashpage 2021-04-07 11:06:48 +08:00
Jimmy
8d71fa85cd [feat]Center happening now events on the splashpage 2021-04-07 11:00:03 +08:00
Jimmy
eda0c1a175 [feat] Display happening now events in splashpage 2021-04-07 10:34:49 +08:00
Jimmy
85cfb0cbef [style] Fix name of method 2021-04-06 13:27:05 +08:00
Jimmy
d6cfecc960 [feat]Move happening_now to ConferenceHelper 2021-04-06 13:16:59 +08:00
Jimmy
e2d775e398 [temp] Add no events happening now in splashpage 2021-04-05 20:45:40 +08:00
Jimmy
9bfe64c28f [temp]Ajax request of happening now JSON in progress 2021-04-05 15:07:18 +08:00
Michael Ball
0e033e7074
Merge pull request #130 from snap-cloud/depfu/update/mimemagic-0.3.6
⚠️ [fixing yanked version] Update mimemagic: 0.3.5 → 0.3.6 (minor)
2021-04-01 12:16:10 -07:00
Jimmy
093241fd0a [temp] Add happening_now placeholder in splashpage 2021-04-01 13:30:44 +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
kingdish
1977b5be49
Merge pull request #36 from CactusPuppy/176895124-happening-now-json-api-endpoint
Happening now json api endpoint
2021-03-31 12:21:30 -07: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
7b3d97fdbb [refactor] Change to_json to as_json 2021-03-31 16:08:44 +08:00
Jimmy
010f72d42f [fix] Fix event_schedule#happening_now? 2021-03-31 08:34:04 +08:00