Move expandConfigRequest method to config.js to avoid dependency. (#…

…16862)
ampproject · Jul 19, 2018 · 47a9a6b · 47a9a6b
1 parent b3ef5b8
commit 47a9a6b
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 60 deletions.
diff --git a/extensions/amp-analytics/0.1/config.js b/extensions/amp-analytics/0.1/config.js
@@ -19,7 +19,6 @@ import {Services} from '../../../src/services';
 import {assertHttpsUrl} from '../../../src/url';
 import {dev, user} from '../../../src/log';
 import {dict, hasOwn} from '../../../src/utils/object';
-import {expandConfigRequest} from './requests';
 import {getMode} from '../../../src/mode';
 import {isArray, isObject} from '../../../src/types';
 import {isJsonScriptTag} from '../../../src/dom';
@@ -328,3 +327,33 @@ export function mergeObjects(from, to, opt_predefinedConfig) {
   }
   return to;
 }
+
+/**
+ * Expand config's request to object
+ * @param {!JsonObject} config
+ * @visibleForTesting
+ */
+export function expandConfigRequest(config) {
+  if (!config['requests']) {
+    return config;
+  }
+  for (const k in config['requests']) {
+    if (hasOwn(config['requests'], k)) {
+      config['requests'][k] = expandRequestStr(config['requests'][k]);
+    }
+  }
+  return config;
+}
+
+/**
+ * Expand single request to an object
+ * @param {!JsonObject} request
+ */
+function expandRequestStr(request) {
+  if (isObject(request)) {
+    return request;
+  }
+  return {
+    'baseUrl': request,
+  };
+}
diff --git a/extensions/amp-analytics/0.1/requests.js b/extensions/amp-analytics/0.1/requests.js
@@ -25,9 +25,8 @@ import {appendEncodedParamStringToUrl} from '../../../src/url';
 import {dev, user} from '../../../src/log';
 import {dict} from '../../../src/utils/object';
 import {filterSplice} from '../../../src/utils/array';
-import {hasOwn, map} from '../../../src/utils/object';
 import {isArray, isFiniteNumber} from '../../../src/types';
-import {isObject} from '../../../src/types';
+import {map} from '../../../src/utils/object';
 import {parseQueryString} from '../../../src/url';
 
 const TAG = 'AMP-ANALYTICS';
@@ -418,32 +417,3 @@ export class RequestHandler {
     }, interval);
   }
 }
-
-/**
- * Expand config's request to object
- * @param {!JsonObject} config
- */
-export function expandConfigRequest(config) {
-  if (!config['requests']) {
-    return config;
-  }
-  for (const k in config['requests']) {
-    if (hasOwn(config['requests'], k)) {
-      config['requests'][k] = expandRequestStr(config['requests'][k]);
-    }
-  }
-  return config;
-}
-
-/**
- * Expand single request to an object
- * @param {!JsonObject} request
- */
-function expandRequestStr(request) {
-  if (isObject(request)) {
-    return request;
-  }
-  return {
-    'baseUrl': request,
-  };
-}
diff --git a/extensions/amp-analytics/0.1/test/test-config.js b/extensions/amp-analytics/0.1/test/test-config.js
@@ -15,7 +15,7 @@
  */
 
 import {ANALYTICS_CONFIG} from '../vendors';
-import {AnalyticsConfig, mergeObjects} from '../config';
+import {AnalyticsConfig, expandConfigRequest, mergeObjects} from '../config';
 import {installDocService} from '../../../../src/service/ampdoc-impl';
 import {map} from '../../../../src/utils/object';
 import {stubService, stubServiceForDoc} from '../../../../testing/test-helper';
@@ -533,6 +533,32 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
     });
   });
 
+  describe('expandConfigRequest', () => {
+    it('expandConfigRequest function', () => {
+      let config = {
+        'requests': {
+          'foo': 'test',
+          'bar': {
+            'baseUrl': 'test1',
+          },
+          'foobar': {},
+        },
+      };
+      config = expandConfigRequest(config);
+      expect(config).to.jsonEqual({
+        'requests': {
+          'foo': {
+            'baseUrl': 'test',
+          },
+          'bar': {
+            'baseUrl': 'test1',
+          },
+          'foobar': {},
+        },
+      });
+    });
+  });
+
   function getAnalyticsTag(config, attrs) {
     config = JSON.stringify(config);
     const el = doc.createElement('amp-analytics');

diff --git a/extensions/amp-analytics/0.1/test/test-requests.js b/extensions/amp-analytics/0.1/test/test-requests.js
@@ -16,7 +16,7 @@
 
 import * as lolex from 'lolex';
 import {ExpansionOptions, installVariableService} from '../variables';
-import {RequestHandler, expandConfigRequest} from '../requests';
+import {RequestHandler} from '../requests';
 import {dict} from '../../../../src/utils/object';
 import {macroTask} from '../../../../testing/yield';
 import {toggleExperiment} from '../../../../src/experiments';
@@ -423,32 +423,6 @@ describes.realWin('Requests', {amp: 1}, env => {
     });
   });
 
-  //TODO: Move the expansion related tests here.
-
-  it('expandConfigRequest function', () => {
-    let config = {
-      'requests': {
-        'foo': 'test',
-        'bar': {
-          'baseUrl': 'test1',
-        },
-        'foobar': {},
-      },
-    };
-    config = expandConfigRequest(config);
-    expect(config).to.jsonEqual({
-      'requests': {
-        'foo': {
-          'baseUrl': 'test',
-        },
-        'bar': {
-          'baseUrl': 'test1',
-        },
-        'foobar': {},
-      },
-    });
-  });
-
   it('should replace dynamic bindings', function* () {
     const spy = sandbox.spy();
     const r = {'baseUrl': 'r1&${extraUrlParams}&BASE_VALUE'};