Move no-signing to RTV exp (#30201)

* move to rtv * add exp config * missed e2e test * coerce to bool
ampproject · Sep 12, 2020 · 973cb29 · 973cb29
1 parent 1d32b79
commit 973cb29
Show file tree

Hide file tree

Showing 7 changed files with 2,869 additions and 2,982 deletions.
diff --git a/build-system/global-configs/experiments-config.json b/build-system/global-configs/experiments-config.json
@@ -1,5 +1,11 @@
 {
-  "experimentA": {},
+  "experimentA": {
+    "name": "A4A No Signing RTV Experiment",
+    "environment": "AMP",
+    "issue": "https://github.com/ampproject/amphtml/issues/27189",
+    "expiration_date_utc": "2020-12-30",
+    "define_experiment_constant": "NO_SIGNING_RTV"
+  },
   "experimentB": {},
   "experimentC": {}
 }
diff --git a/build-system/tasks/e2e/amp-driver.js b/build-system/tasks/e2e/amp-driver.js
@@ -22,7 +22,6 @@ const AmpdocEnvironment = {
 
   // AMPHTML ads environments
   A4A_FIE: 'a4a-fie',
-  A4A_FIE_NO_SIGNING: 'a4a-fie-no-signing',
   A4A_INABOX: 'a4a-inabox',
   A4A_INABOX_FRIENDLY: 'a4a-inabox-friendly',
   A4A_INABOX_SAFEFRAME: 'a4a-inabox-safeframe',
@@ -99,21 +98,6 @@ const EnvironmentBehaviorMap = {
     },
   },
 
-  [AmpdocEnvironment.A4A_FIE_NO_SIGNING]: {
-    async ready(controller) {
-      return controller
-        .findElement('amp-ad > iframe')
-        .then((frame) => controller.switchToFrame(frame));
-    },
-
-    url(url) {
-      const a4aUrl = url.replace(HOST, HOST + '/a4a');
-      // Exp value is from extensions/amp-a4a/0.1/amp-a4a.js
-      // NO_SIGNING_EXP.experiment
-      return `${a4aUrl}?eid=a4a-no-signing:21066325`;
-    },
-  },
-
   [AmpdocEnvironment.A4A_INABOX]: {
     async ready(controller) {
       return controller

diff --git a/build-system/tasks/e2e/describes-e2e.js b/build-system/tasks/e2e/describes-e2e.js
@@ -254,10 +254,6 @@ const EnvironmentVariantMap = {
     name: 'AMPHTML ads FIE environment',
     value: {environment: 'a4a-fie'},
   },
-  [AmpdocEnvironment.A4A_FIE_NO_SIGNING]: {
-    name: 'AMPHTML ads FIE environment with no-signing exp enabled',
-    value: {environment: 'a4a-fie-no-signing'},
-  },
   [AmpdocEnvironment.A4A_INABOX]: {
     name: 'AMPHTML ads inabox environment',
     value: {environment: 'a4a-inabox'},
@@ -280,7 +276,6 @@ const envPresets = {
   ],
   'amp4ads-preset': [
     AmpdocEnvironment.A4A_FIE,
-    AmpdocEnvironment.A4A_FIE_NO_SIGNING,
     AmpdocEnvironment.A4A_INABOX,
     AmpdocEnvironment.A4A_INABOX_FRIENDLY,
     AmpdocEnvironment.A4A_INABOX_SAFEFRAME,

diff --git a/extensions/amp-a4a/0.1/amp-a4a.js b/extensions/amp-a4a/0.1/amp-a4a.js
@@ -50,7 +50,6 @@ import {
   getConsentPolicyState,
 } from '../../../src/consent';
 import {getContextMetadata} from '../../../src/iframe-attributes';
-import {getExperimentBranch} from '../../../src/experiments';
 import {getMode} from '../../../src/mode';
 import {insertAnalyticsElement} from '../../../src/extension-analytics';
 import {
@@ -179,15 +178,6 @@ const LIFECYCLE_STAGE_TO_ANALYTICS_TRIGGER = {
   'crossDomainIframeLoaded': AnalyticsTrigger.AD_IFRAME_LOADED,
 };
 
-/**
- * @const @enum {string}
- */
-export const NO_SIGNING_EXP = {
-  id: 'a4a-no-signing',
-  control: '21066324',
-  experiment: '21066325',
-};
-
 /** @const @enum {string} */
 export const MODULE_NOMODULE_PARAMS_EXP = {
   ID: 'module-nomodule',
@@ -870,10 +860,8 @@ export class AmpA4A extends AMP.BaseElement {
    * @return {boolean}
    */
   isInNoSigningExp() {
-    return (
-      getExperimentBranch(this.win, NO_SIGNING_EXP.id) ===
-      NO_SIGNING_EXP.experiment
-    );
+    // eslint-disable-next-line no-undef
+    return !!NO_SIGNING_RTV;
   }
 
   /**