diff --git a/core/server/api/canary/utils/serializers/input/members.js b/core/server/api/canary/utils/serializers/input/members.js index e1a5195a44..42e342d781 100644 --- a/core/server/api/canary/utils/serializers/input/members.js +++ b/core/server/api/canary/utils/serializers/input/members.js @@ -20,6 +20,10 @@ module.exports = { debug('browse'); defaultRelations(frame); + if (!frame.options.order) { + frame.options.autoOrder = 'created_at DESC, id DESC'; + } + if (labsService.isSet('multipleNewsletters')) { frame.options.mongoTransformer = mapNQLKeyValues({ key: { diff --git a/test/e2e-api/admin/__snapshots__/members-newsletters.test.js.snap b/test/e2e-api/admin/__snapshots__/members-newsletters.test.js.snap index c7f22e5366..85b8fadd32 100644 --- a/test/e2e-api/admin/__snapshots__/members-newsletters.test.js.snap +++ b/test/e2e-api/admin/__snapshots__/members-newsletters.test.js.snap @@ -3,26 +3,6 @@ exports[`Members API - No Newsletters Can fetch members who are NOT subscribed 1: [body] 1`] = ` Object { "members": Array [ - Object { - "avatar_image": null, - "comped": false, - "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "vip-paid@test.com", - "email_count": 0, - "email_open_rate": null, - "email_opened_count": 0, - "geolocation": null, - "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, - "labels": Any, - "last_seen_at": null, - "name": "Peter Venkman", - "note": null, - "status": "paid", - "subscribed": false, - "subscriptions": Any, - "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, - }, Object { "avatar_image": null, "comped": false, @@ -43,6 +23,26 @@ Object { "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, }, + Object { + "avatar_image": null, + "comped": false, + "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "email": "vip-paid@test.com", + "email_count": 0, + "email_open_rate": null, + "email_opened_count": 0, + "geolocation": null, + "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, + "labels": Any, + "last_seen_at": null, + "name": "Peter Venkman", + "note": null, + "status": "paid", + "subscribed": false, + "subscriptions": Any, + "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, + }, ], "meta": Object { "pagination": Object { @@ -76,7 +76,7 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "member1@test.com", + "email": "vip@test.com", "email_count": 0, "email_open_rate": null, "email_opened_count": 0, @@ -84,7 +84,7 @@ Object { "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "Mr Egg", + "name": "Winston Zeddemore", "note": null, "status": "free", "subscribed": true, @@ -96,35 +96,15 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "member2@test.com", + "email": "comped@test.com", "email_count": 0, - "email_open_rate": 50, + "email_open_rate": null, "email_opened_count": 0, "geolocation": null, "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": null, - "note": null, - "status": "free", - "subscribed": true, - "subscriptions": Any, - "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, - }, - Object { - "avatar_image": null, - "comped": false, - "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "paid@test.com", - "email_count": 0, - "email_open_rate": 80, - "email_opened_count": 0, - "geolocation": null, - "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, - "labels": Any, - "last_seen_at": null, - "name": "Egon Spengler", + "name": "Vinz Clortho", "note": null, "status": "paid", "subscribed": true, @@ -156,15 +136,15 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "comped@test.com", + "email": "paid@test.com", "email_count": 0, - "email_open_rate": null, + "email_open_rate": 80, "email_opened_count": 0, "geolocation": null, "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "Vinz Clortho", + "name": "Egon Spengler", "note": null, "status": "paid", "subscribed": true, @@ -176,7 +156,27 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "vip@test.com", + "email": "member2@test.com", + "email_count": 0, + "email_open_rate": 50, + "email_opened_count": 0, + "geolocation": null, + "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, + "labels": Any, + "last_seen_at": null, + "name": null, + "note": null, + "status": "free", + "subscribed": true, + "subscriptions": Any, + "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, + }, + Object { + "avatar_image": null, + "comped": false, + "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "email": "member1@test.com", "email_count": 0, "email_open_rate": null, "email_opened_count": 0, @@ -184,7 +184,7 @@ Object { "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "Winston Zeddemore", + "name": "Mr Egg", "note": null, "status": "free", "subscribed": true, @@ -225,7 +225,7 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "vip-paid@test.com", + "email": "with-product@test.com", "email_count": 0, "email_open_rate": null, "email_opened_count": 0, @@ -233,7 +233,7 @@ Object { "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "Peter Venkman", + "name": "Dana Barrett", "newsletters": Any, "note": null, "status": "paid", @@ -246,7 +246,7 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "with-product@test.com", + "email": "vip-paid@test.com", "email_count": 0, "email_open_rate": null, "email_opened_count": 0, @@ -254,7 +254,7 @@ Object { "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "Dana Barrett", + "name": "Peter Venkman", "newsletters": Any, "note": null, "status": "paid", @@ -296,7 +296,7 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "member1@test.com", + "email": "vip@test.com", "email_count": 0, "email_open_rate": null, "email_opened_count": 0, @@ -304,7 +304,7 @@ Object { "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "Mr Egg", + "name": "Winston Zeddemore", "newsletters": Any, "note": null, "status": "free", @@ -317,36 +317,15 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "member2@test.com", + "email": "comped@test.com", "email_count": 0, - "email_open_rate": 50, + "email_open_rate": null, "email_opened_count": 0, "geolocation": null, "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": null, - "newsletters": Any, - "note": null, - "status": "free", - "subscribed": true, - "subscriptions": Any, - "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, - }, - Object { - "avatar_image": null, - "comped": false, - "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "paid@test.com", - "email_count": 0, - "email_open_rate": 80, - "email_opened_count": 0, - "geolocation": null, - "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, - "labels": Any, - "last_seen_at": null, - "name": "Egon Spengler", + "name": "Vinz Clortho", "newsletters": Any, "note": null, "status": "paid", @@ -380,15 +359,15 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "comped@test.com", + "email": "paid@test.com", "email_count": 0, - "email_open_rate": null, + "email_open_rate": 80, "email_opened_count": 0, "geolocation": null, "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "Vinz Clortho", + "name": "Egon Spengler", "newsletters": Any, "note": null, "status": "paid", @@ -401,7 +380,28 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "vip@test.com", + "email": "member2@test.com", + "email_count": 0, + "email_open_rate": 50, + "email_opened_count": 0, + "geolocation": null, + "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, + "labels": Any, + "last_seen_at": null, + "name": null, + "newsletters": Any, + "note": null, + "status": "free", + "subscribed": true, + "subscriptions": Any, + "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, + }, + Object { + "avatar_image": null, + "comped": false, + "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "email": "member1@test.com", "email_count": 0, "email_open_rate": null, "email_opened_count": 0, @@ -409,7 +409,7 @@ Object { "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "Winston Zeddemore", + "name": "Mr Egg", "newsletters": Any, "note": null, "status": "free", @@ -451,7 +451,7 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "vip-paid@test.com", + "email": "with-product@test.com", "email_count": 0, "email_open_rate": null, "email_opened_count": 0, @@ -459,7 +459,7 @@ Object { "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "Peter Venkman", + "name": "Dana Barrett", "newsletters": Any, "note": null, "status": "paid", @@ -472,7 +472,7 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "with-product@test.com", + "email": "vip-paid@test.com", "email_count": 0, "email_open_rate": null, "email_opened_count": 0, @@ -480,7 +480,7 @@ Object { "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "Dana Barrett", + "name": "Peter Venkman", "newsletters": Any, "note": null, "status": "paid", @@ -522,7 +522,7 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "member1@test.com", + "email": "vip@test.com", "email_count": 0, "email_open_rate": null, "email_opened_count": 0, @@ -530,7 +530,7 @@ Object { "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "Mr Egg", + "name": "Winston Zeddemore", "newsletters": Any, "note": null, "status": "free", @@ -543,36 +543,15 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "member2@test.com", + "email": "comped@test.com", "email_count": 0, - "email_open_rate": 50, + "email_open_rate": null, "email_opened_count": 0, "geolocation": null, "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": null, - "newsletters": Any, - "note": null, - "status": "free", - "subscribed": true, - "subscriptions": Any, - "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, - }, - Object { - "avatar_image": null, - "comped": false, - "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "paid@test.com", - "email_count": 0, - "email_open_rate": 80, - "email_opened_count": 0, - "geolocation": null, - "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, - "labels": Any, - "last_seen_at": null, - "name": "Egon Spengler", + "name": "Vinz Clortho", "newsletters": Any, "note": null, "status": "paid", @@ -606,15 +585,15 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "comped@test.com", + "email": "paid@test.com", "email_count": 0, - "email_open_rate": null, + "email_open_rate": 80, "email_opened_count": 0, "geolocation": null, "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "Vinz Clortho", + "name": "Egon Spengler", "newsletters": Any, "note": null, "status": "paid", @@ -627,7 +606,28 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "vip@test.com", + "email": "member2@test.com", + "email_count": 0, + "email_open_rate": 50, + "email_opened_count": 0, + "geolocation": null, + "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, + "labels": Any, + "last_seen_at": null, + "name": null, + "newsletters": Any, + "note": null, + "status": "free", + "subscribed": true, + "subscriptions": Any, + "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, + }, + Object { + "avatar_image": null, + "comped": false, + "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "email": "member1@test.com", "email_count": 0, "email_open_rate": null, "email_opened_count": 0, @@ -635,7 +635,7 @@ Object { "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "Winston Zeddemore", + "name": "Mr Egg", "newsletters": Any, "note": null, "status": "free", diff --git a/test/e2e-api/admin/__snapshots__/members.test.js.snap b/test/e2e-api/admin/__snapshots__/members.test.js.snap index 11d6997b47..20fae09f99 100644 --- a/test/e2e-api/admin/__snapshots__/members.test.js.snap +++ b/test/e2e-api/admin/__snapshots__/members.test.js.snap @@ -555,7 +555,7 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "member1@test.com", + "email": "with-product@test.com", "email_count": 0, "email_open_rate": null, "email_opened_count": 0, @@ -563,7 +563,49 @@ Object { "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "Mr Egg", + "name": "Dana Barrett", + "newsletters": Any, + "note": null, + "status": "paid", + "subscribed": false, + "subscriptions": Any, + "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, + }, + Object { + "avatar_image": null, + "comped": false, + "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "email": "vip-paid@test.com", + "email_count": 0, + "email_open_rate": null, + "email_opened_count": 0, + "geolocation": null, + "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, + "labels": Any, + "last_seen_at": null, + "name": "Peter Venkman", + "newsletters": Any, + "note": null, + "status": "paid", + "subscribed": false, + "subscriptions": Any, + "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, + }, + Object { + "avatar_image": null, + "comped": false, + "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "email": "vip@test.com", + "email_count": 0, + "email_open_rate": null, + "email_opened_count": 0, + "geolocation": null, + "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, + "labels": Any, + "last_seen_at": null, + "name": "Winston Zeddemore", "newsletters": Any, "note": null, "status": "free", @@ -576,36 +618,15 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "member2@test.com", + "email": "comped@test.com", "email_count": 0, - "email_open_rate": 50, + "email_open_rate": null, "email_opened_count": 0, "geolocation": null, "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": null, - "newsletters": Any, - "note": null, - "status": "free", - "subscribed": true, - "subscriptions": Any, - "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, - }, - Object { - "avatar_image": null, - "comped": false, - "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "paid@test.com", - "email_count": 0, - "email_open_rate": 80, - "email_opened_count": 0, - "geolocation": null, - "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, - "labels": Any, - "last_seen_at": null, - "name": "Egon Spengler", + "name": "Vinz Clortho", "newsletters": Any, "note": null, "status": "paid", @@ -639,15 +660,15 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "comped@test.com", + "email": "paid@test.com", "email_count": 0, - "email_open_rate": null, + "email_open_rate": 80, "email_opened_count": 0, "geolocation": null, "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "Vinz Clortho", + "name": "Egon Spengler", "newsletters": Any, "note": null, "status": "paid", @@ -660,15 +681,15 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "vip@test.com", + "email": "member2@test.com", "email_count": 0, - "email_open_rate": null, + "email_open_rate": 50, "email_opened_count": 0, "geolocation": null, "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "Winston Zeddemore", + "name": null, "newsletters": Any, "note": null, "status": "free", @@ -681,7 +702,7 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "vip-paid@test.com", + "email": "member1@test.com", "email_count": 0, "email_open_rate": null, "email_opened_count": 0, @@ -689,32 +710,11 @@ Object { "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "Peter Venkman", + "name": "Mr Egg", "newsletters": Any, "note": null, - "status": "paid", - "subscribed": false, - "subscriptions": Any, - "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, - }, - Object { - "avatar_image": null, - "comped": false, - "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "with-product@test.com", - "email_count": 0, - "email_open_rate": null, - "email_opened_count": 0, - "geolocation": null, - "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, - "labels": Any, - "last_seen_at": null, - "name": "Dana Barrett", - "newsletters": Any, - "note": null, - "status": "paid", - "subscribed": false, + "status": "free", + "subscribed": true, "subscriptions": Any, "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, @@ -1298,15 +1298,57 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "paid@test.com", + "email": "with-product@test.com", "email_count": 0, - "email_open_rate": 80, + "email_open_rate": null, "email_opened_count": 0, "geolocation": null, "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "Egon Spengler", + "name": "Dana Barrett", + "newsletters": Any, + "note": null, + "status": "paid", + "subscribed": false, + "subscriptions": Any, + "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, + }, + Object { + "avatar_image": null, + "comped": false, + "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "email": "vip-paid@test.com", + "email_count": 0, + "email_open_rate": null, + "email_opened_count": 0, + "geolocation": null, + "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, + "labels": Any, + "last_seen_at": null, + "name": "Peter Venkman", + "newsletters": Any, + "note": null, + "status": "paid", + "subscribed": false, + "subscriptions": Any, + "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, + }, + Object { + "avatar_image": null, + "comped": false, + "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "email": "comped@test.com", + "email_count": 0, + "email_open_rate": null, + "email_opened_count": 0, + "geolocation": null, + "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, + "labels": Any, + "last_seen_at": null, + "name": "Vinz Clortho", "newsletters": Any, "note": null, "status": "paid", @@ -1340,15 +1382,15 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "comped@test.com", + "email": "paid@test.com", "email_count": 0, - "email_open_rate": null, + "email_open_rate": 80, "email_opened_count": 0, "geolocation": null, "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "Vinz Clortho", + "name": "Egon Spengler", "newsletters": Any, "note": null, "status": "paid", @@ -1357,48 +1399,6 @@ Object { "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, }, - Object { - "avatar_image": null, - "comped": false, - "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "vip-paid@test.com", - "email_count": 0, - "email_open_rate": null, - "email_opened_count": 0, - "geolocation": null, - "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, - "labels": Any, - "last_seen_at": null, - "name": "Peter Venkman", - "newsletters": Any, - "note": null, - "status": "paid", - "subscribed": false, - "subscriptions": Any, - "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, - }, - Object { - "avatar_image": null, - "comped": false, - "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "with-product@test.com", - "email_count": 0, - "email_open_rate": null, - "email_opened_count": 0, - "geolocation": null, - "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, - "labels": Any, - "last_seen_at": null, - "name": "Dana Barrett", - "newsletters": Any, - "note": null, - "status": "paid", - "subscribed": false, - "subscriptions": Any, - "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, - }, ], "meta": Object { "pagination": Object { @@ -1432,7 +1432,7 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "trialing@test.com", + "email": "member2create@test.com", "email_count": 0, "email_open_rate": null, "email_opened_count": 0, @@ -1440,31 +1440,10 @@ Object { "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "Ray Stantz", + "name": "create me", "newsletters": Any, "note": null, - "status": "paid", - "subscribed": true, - "subscriptions": Any, - "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, - }, - Object { - "avatar_image": null, - "comped": false, - "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "comped@test.com", - "email_count": 0, - "email_open_rate": null, - "email_opened_count": 0, - "geolocation": null, - "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, - "labels": Any, - "last_seen_at": null, - "name": "Vinz Clortho", - "newsletters": Any, - "note": null, - "status": "paid", + "status": "free", "subscribed": true, "subscriptions": Any, "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, @@ -1495,7 +1474,7 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "member2create@test.com", + "email": "comped@test.com", "email_count": 0, "email_open_rate": null, "email_opened_count": 0, @@ -1503,10 +1482,31 @@ Object { "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "create me", + "name": "Vinz Clortho", "newsletters": Any, "note": null, - "status": "free", + "status": "paid", + "subscribed": true, + "subscriptions": Any, + "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, + }, + Object { + "avatar_image": null, + "comped": false, + "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "email": "trialing@test.com", + "email_count": 0, + "email_open_rate": null, + "email_opened_count": 0, + "geolocation": null, + "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, + "labels": Any, + "last_seen_at": null, + "name": "Ray Stantz", + "newsletters": Any, + "note": null, + "status": "paid", "subscribed": true, "subscriptions": Any, "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, @@ -1595,15 +1595,57 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "paid@test.com", + "email": "with-product@test.com", "email_count": 0, - "email_open_rate": 80, + "email_open_rate": null, "email_opened_count": 0, "geolocation": null, "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "Egon Spengler", + "name": "Dana Barrett", + "newsletters": Any, + "note": null, + "status": "paid", + "subscribed": false, + "subscriptions": Any, + "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, + }, + Object { + "avatar_image": null, + "comped": false, + "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "email": "vip-paid@test.com", + "email_count": 0, + "email_open_rate": null, + "email_opened_count": 0, + "geolocation": null, + "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, + "labels": Any, + "last_seen_at": null, + "name": "Peter Venkman", + "newsletters": Any, + "note": null, + "status": "paid", + "subscribed": false, + "subscriptions": Any, + "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, + }, + Object { + "avatar_image": null, + "comped": false, + "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "email": "comped@test.com", + "email_count": 0, + "email_open_rate": null, + "email_opened_count": 0, + "geolocation": null, + "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, + "labels": Any, + "last_seen_at": null, + "name": "Vinz Clortho", "newsletters": Any, "note": null, "status": "paid", @@ -1637,15 +1679,15 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "comped@test.com", + "email": "paid@test.com", "email_count": 0, - "email_open_rate": null, + "email_open_rate": 80, "email_opened_count": 0, "geolocation": null, "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "Vinz Clortho", + "name": "Egon Spengler", "newsletters": Any, "note": null, "status": "paid", @@ -1654,48 +1696,6 @@ Object { "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, }, - Object { - "avatar_image": null, - "comped": false, - "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "vip-paid@test.com", - "email_count": 0, - "email_open_rate": null, - "email_opened_count": 0, - "geolocation": null, - "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, - "labels": Any, - "last_seen_at": null, - "name": "Peter Venkman", - "newsletters": Any, - "note": null, - "status": "paid", - "subscribed": false, - "subscriptions": Any, - "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, - }, - Object { - "avatar_image": null, - "comped": false, - "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "with-product@test.com", - "email_count": 0, - "email_open_rate": null, - "email_opened_count": 0, - "geolocation": null, - "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, - "labels": Any, - "last_seen_at": null, - "name": "Dana Barrett", - "newsletters": Any, - "note": null, - "status": "paid", - "subscribed": false, - "subscriptions": Any, - "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, - }, ], "meta": Object { "pagination": Object { @@ -2795,7 +2795,7 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "member1@test.com", + "email": "with-product@test.com", "email_count": 0, "email_open_rate": null, "email_opened_count": 0, @@ -2803,7 +2803,49 @@ Object { "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "Mr Egg", + "name": "Dana Barrett", + "newsletters": Any, + "note": null, + "status": "paid", + "subscribed": false, + "subscriptions": Any, + "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, + }, + Object { + "avatar_image": null, + "comped": false, + "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "email": "vip-paid@test.com", + "email_count": 0, + "email_open_rate": null, + "email_opened_count": 0, + "geolocation": null, + "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, + "labels": Any, + "last_seen_at": null, + "name": "Peter Venkman", + "newsletters": Any, + "note": null, + "status": "paid", + "subscribed": false, + "subscriptions": Any, + "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, + }, + Object { + "avatar_image": null, + "comped": false, + "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "email": "vip@test.com", + "email_count": 0, + "email_open_rate": null, + "email_opened_count": 0, + "geolocation": null, + "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, + "labels": Any, + "last_seen_at": null, + "name": "Winston Zeddemore", "newsletters": Any, "note": null, "status": "free", @@ -2816,36 +2858,15 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "member2@test.com", + "email": "comped@test.com", "email_count": 0, - "email_open_rate": 50, + "email_open_rate": null, "email_opened_count": 0, "geolocation": null, "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": null, - "newsletters": Any, - "note": null, - "status": "free", - "subscribed": true, - "subscriptions": Any, - "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, - }, - Object { - "avatar_image": null, - "comped": false, - "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "paid@test.com", - "email_count": 0, - "email_open_rate": 80, - "email_opened_count": 0, - "geolocation": null, - "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, - "labels": Any, - "last_seen_at": null, - "name": "Egon Spengler", + "name": "Vinz Clortho", "newsletters": Any, "note": null, "status": "paid", @@ -2879,15 +2900,15 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "comped@test.com", + "email": "paid@test.com", "email_count": 0, - "email_open_rate": null, + "email_open_rate": 80, "email_opened_count": 0, "geolocation": null, "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "Vinz Clortho", + "name": "Egon Spengler", "newsletters": Any, "note": null, "status": "paid", @@ -2900,15 +2921,15 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "vip@test.com", + "email": "member2@test.com", "email_count": 0, - "email_open_rate": null, + "email_open_rate": 50, "email_opened_count": 0, "geolocation": null, "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "Winston Zeddemore", + "name": null, "newsletters": Any, "note": null, "status": "free", @@ -2921,7 +2942,7 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "vip-paid@test.com", + "email": "member1@test.com", "email_count": 0, "email_open_rate": null, "email_opened_count": 0, @@ -2929,32 +2950,11 @@ Object { "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "Peter Venkman", + "name": "Mr Egg", "newsletters": Any, "note": null, - "status": "paid", - "subscribed": false, - "subscriptions": Any, - "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, - }, - Object { - "avatar_image": null, - "comped": false, - "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "with-product@test.com", - "email_count": 0, - "email_open_rate": null, - "email_opened_count": 0, - "geolocation": null, - "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, - "labels": Any, - "last_seen_at": null, - "name": "Dana Barrett", - "newsletters": Any, - "note": null, - "status": "paid", - "subscribed": false, + "status": "free", + "subscribed": true, "subscriptions": Any, "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, @@ -2992,7 +2992,7 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "trialing@test.com", + "email": "memberTestNewsletterAdd@test.com", "email_count": 0, "email_open_rate": null, "email_opened_count": 0, @@ -3000,31 +3000,10 @@ Object { "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "Ray Stantz", + "name": "test", "newsletters": Any, - "note": null, - "status": "paid", - "subscribed": true, - "subscriptions": Any, - "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, - }, - Object { - "avatar_image": null, - "comped": false, - "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "comped@test.com", - "email_count": 0, - "email_open_rate": null, - "email_opened_count": 0, - "geolocation": null, - "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, - "labels": Any, - "last_seen_at": null, - "name": "Vinz Clortho", - "newsletters": Any, - "note": null, - "status": "paid", + "note": "test note", + "status": "free", "subscribed": true, "subscriptions": Any, "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, @@ -3055,7 +3034,7 @@ Object { "avatar_image": null, "comped": false, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, - "email": "memberTestNewsletterAdd@test.com", + "email": "comped@test.com", "email_count": 0, "email_open_rate": null, "email_opened_count": 0, @@ -3063,10 +3042,31 @@ Object { "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "labels": Any, "last_seen_at": null, - "name": "test", + "name": "Vinz Clortho", "newsletters": Any, - "note": "test note", - "status": "free", + "note": null, + "status": "paid", + "subscribed": true, + "subscriptions": Any, + "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "uuid": StringMatching /\\[a-f0-9\\]\\{8\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{4\\}-\\[a-f0-9\\]\\{12\\}/, + }, + Object { + "avatar_image": null, + "comped": false, + "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, + "email": "trialing@test.com", + "email_count": 0, + "email_open_rate": null, + "email_opened_count": 0, + "geolocation": null, + "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, + "labels": Any, + "last_seen_at": null, + "name": "Ray Stantz", + "newsletters": Any, + "note": null, + "status": "paid", "subscribed": true, "subscriptions": Any, "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}T\\\\d\\{2\\}:\\\\d\\{2\\}:\\\\d\\{2\\}\\\\\\.000Z/, diff --git a/test/e2e-api/admin/legacy-members.test.js b/test/e2e-api/admin/legacy-members.test.js index 0674b845dd..7c5be7645a 100644 --- a/test/e2e-api/admin/legacy-members.test.js +++ b/test/e2e-api/admin/legacy-members.test.js @@ -102,8 +102,8 @@ describe('Legacy Members API', function () { should.exist(jsonResponse); should.exist(jsonResponse.members); jsonResponse.members.should.have.length(5); - jsonResponse.members[0].email.should.equal('paid@test.com'); - jsonResponse.members[1].email.should.equal('trialing@test.com'); + jsonResponse.members[0].email.should.equal('with-product@test.com'); + jsonResponse.members[1].email.should.equal('vip-paid@test.com'); localUtils.API.checkResponse(jsonResponse, 'members'); localUtils.API.checkResponse(jsonResponse.members[0], 'member', 'subscriptions'); localUtils.API.checkResponse(jsonResponse.meta.pagination, 'pagination');