Update add newsletter tests and screenshots for BYOE (#4027)

* Update newsletter test and screenshot

* Add missing set of screenshots

* Add tests for BYOE user journey

Author: binaryscales

test/e2e/commands/checkEmailOptIn.js

@@ -0,0 +1,28 @@
+/**
+ * Copyright 2019 The Subscribe with Google Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @fileoverview Switch to Google account sign in window and check that it prompts
+ * the user to sign in.
+ */
+
+const constants = require('../constants');
+
+module.exports.command = function () {
+  return this.pause(2000)
+    .switchToTab('Email opt in')
+    .assert.urlContains(constants.google.newsDomain);
+};

test/e2e/constants.js

@@ -17,6 +17,7 @@
 module.exports = {
   google: {
     accountsDomain: 'accounts.google.com',
+    newsDomain: 'news.google.com',
     domain: 'google.com',
   },
   setup: {

test/e2e/pages/basicNewsletter.js

@@ -33,8 +33,15 @@ const commands = {
   consentToNewsletter: function () {
     return this.log('Checking consent checkbox').click('@consentCheckbox');
   },
-  optInAction: function () {
-    return this.log('Clicking opt in button').click('@optInButton');
+  optInWithGoogleAction: function () {
+    return this.log('Clicking opt in with Google button').click(
+      '@optInWithGoogleButton'
+    );
+  },
+  optInWithEmailAction: function () {
+    return this.log('Clicking opt in with email button').click(
+      '@optInWithEmailButton'
+    );
   },
 };
 
@@ -54,8 +61,11 @@ module.exports = {
     consentMessage: {
       selector: '[jsname="ERYeZe"] label',
     },
-    optInButton: {
-      selector: '[jsname="rANL7b"] button',
+    optInWithGoogleButton: {
+      selector: '[jsname="ykYhEd"]',
+    },
+    optInWithEmailButton: {
+      selector: '[jsname="Zhn5O"]',
     },
     swgDialog: {
       selector: '.swg-dialog',

test/e2e/pages/enterpriseNewsletter.js

@@ -30,8 +30,15 @@ const commands = {
   consentToNewsletter: function () {
     return this.log('Checking consent checkbox').click('@consentCheckbox');
   },
-  optInAction: function () {
-    return this.log('Clicking opt in button').click('@optInButton');
+  optInWithGoogleAction: function () {
+    return this.log('Clicking opt in with Google button').click(
+      '@optInWithGoogleButton'
+    );
+  },
+  optInWithEmailAction: function () {
+    return this.log('Clicking opt in with email button').click(
+      '@optInWithEmailButton'
+    );
   },
 };
 
@@ -54,8 +61,11 @@ module.exports = {
     newsletterHeader: {
       selector: '[jsname="ekWun"]',
     },
-    optInButton: {
-      selector: '[jsname="rANL7b"] button',
+    optInWithGoogleButton: {
+      selector: '[jsname="ykYhEd"]',
+    },
+    optInWithEmailButton: {
+      selector: '[jsname="Zhn5O"]',
     },
     swgDialog: {
       selector: '.swg-dialog',

test/e2e/tests/basicByoeNewsletter.js

@@ -0,0 +1,38 @@
+/**
+ * Copyright 2019 The Subscribe with Google Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+module.exports = {
+  '@tags': ['basic'],
+
+  'Show button': (browser) => {
+    const basic = browser.page.basicNewsletter();
+    basic
+      .navigate()
+      .waitForElementPresent('@swgDialog', 'Found SwG dialog')
+      .waitForElementVisible('@swgDialog')
+      .pause(3000)
+      .assert.screenshotIdenticalToBaseline('html', 'basic-newsletter')
+      .viewNewsletter()
+      .assert.textContains(
+        '@consentMessage',
+        'Please sign up for my newsletter!'
+      )
+      .consentToNewsletter()
+      .optInWithEmailAction()
+      .checkEmailOptIn()
+      .end();
+  },
+};

test/e2e/tests/basicNewsletter.js

@@ -31,7 +31,7 @@ module.exports = {
         'Please sign up for my newsletter!'
       )
       .consentToNewsletter()
-      .optInAction()
+      .optInWithGoogleAction()
       .checkSignIn()
       .end();
   },

test/e2e/tests/enterpriseByoeNewsletter.js

@@ -0,0 +1,37 @@
+/**
+ * Copyright 2019 The Subscribe with Google Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+module.exports = {
+  '@tags': ['enterprise'],
+
+  'Enterprise Newsletter': (browser) => {
+    const enterprise = browser.page.enterpriseNewsletter();
+    enterprise
+      .navigate()
+      .pause(3000)
+      .assert.screenshotIdenticalToBaseline('html', 'enterprise-newsletter')
+      .viewNewsletter()
+      .assert.textContains(
+        '@newsletterHeader',
+        'Enterprise Contribution E2E Test Pub'
+      )
+      .assert.textContains('@consentMessage', 'I consent to this newsletter.')
+      .consentToNewsletter()
+      .optInWithEmailAction()
+      .checkEmailOptIn()
+      .end();
+  },
+};

test/e2e/tests/enterpriseNewsletter.js

@@ -30,7 +30,7 @@ module.exports = {
       )
       .assert.textContains('@consentMessage', 'I consent to this newsletter.')
       .consentToNewsletter()
-      .optInAction()
+      .optInWithGoogleAction()
       .checkSignIn()
       .end();
   },