Skip to content

Commit a950c37

Browse files
committed
(2019-10-01, 0ab715e) amp-action-macro: 1
Previous history on prod-config.json: - 0ab715e - 2019-10-01T10:32:36-04:00 - Launch <amp-action-macro>
1 parent ae4855d commit a950c37

File tree

5 files changed

+4
-16
lines changed

5 files changed

+4
-16
lines changed

build-system/global-configs/canary-config.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"canary": 1,
66
"a4aProfilingRate": 0.01,
77
"adsense-ad-size-optimization": 0.1,
8-
"amp-action-macro": 1,
98
"amp-story-responsive-units": 1,
109
"amp-story-v1": 1,
1110
"chunked-amp": 1,

build-system/global-configs/prod-config.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"a4aProfilingRate": 0.01,
66
"adsense-ad-size-optimization": 0.1,
77
"amp-accordion-display-locking": 1,
8-
"amp-action-macro": 1,
98
"amp-story-responsive-units": 1,
109
"amp-story-v1": 1,
1110
"chunked-amp": 1,

extensions/amp-action-macro/0.1/amp-action-macro.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
import {LayoutPriority} from '../../../src/layout';
1717
import {Services} from '../../../src/services';
18-
import {isExperimentOn} from '../../../src/experiments';
1918
import {userAssert} from '../../../src/log';
2019

2120
/** @const {string} */
@@ -39,7 +38,8 @@ export class AmpActionMacro extends AMP.BaseElement {
3938
/** @override */
4039
buildCallback() {
4140
userAssert(
42-
isExperimentOn(this.win, 'amp-action-macro'),
41+
/* isExperimentOn(this.win, 'amp-action-macro') // launched: true */
42+
true,
4343
'Experiment is off'
4444
);
4545
const {element} = this;

extensions/amp-action-macro/0.1/test/test-amp-action-macro.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import {ActionInvocation} from '../../../../src/service/action-impl';
1818
import {ActionTrust} from '../../../../src/action-constants';
1919
import {AmpActionMacro} from '../amp-action-macro';
2020
import {Services} from '../../../../src/services';
21-
import {toggleExperiment} from '../../../../src/experiments';
2221

2322
describes.realWin(
2423
'amp-action-macro',
@@ -35,8 +34,6 @@ describes.realWin(
3534
beforeEach(() => {
3635
win = env.win;
3736
doc = win.document;
38-
39-
toggleExperiment(win, 'amp-action-macro', true);
4037
});
4138

4239
function newActionMacro() {
@@ -60,7 +57,8 @@ describes.realWin(
6057

6158
it('should not build if experiment is off', () => {
6259
return allowConsoleError(() => {
63-
toggleExperiment(env.win, 'amp-action-macro', false);
60+
/* toggleExperiment(env.win, 'amp-action-macro', false) // launched: true */
61+
false;
6462
return newActionMacro().catch((err) => {
6563
expect(err.message).to.include('Experiment is off');
6664
});
@@ -75,8 +73,6 @@ describes.realWin(
7573
let unreferrableMacro;
7674
let unreferrableMacroElement;
7775
beforeEach(() => {
78-
toggleExperiment(win, 'amp-action-macro', true);
79-
8076
// This macro is referrable and can be invoked by the macro element(s)
8177
// defined after it.
8278
referrableMacroElement = doc.createElement('amp-action-macro');

tools/experiments/experiments-config.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,6 @@ export const EXPERIMENTS = [
7575
name: 'Allows the new lightbox experience to be used in A4A (prototype).',
7676
spec: 'https://github.com/ampproject/amphtml/issues/7743',
7777
},
78-
{
79-
id: 'amp-action-macro',
80-
name: 'AMP extension for defining action macros',
81-
spec: 'https://github.com/ampproject/amphtml/issues/19494',
82-
cleanupIssue: 'https://github.com/ampproject/amphtml/pull/19495',
83-
},
8478
{
8579
id: 'ios-fixed-no-transfer',
8680
name: 'Remove fixed transfer from iOS 12.2 and up',

0 commit comments

Comments
 (0)