From 617f8dd90f25671c9c2fd64fde11636aa1f32a0f Mon Sep 17 00:00:00 2001
From: jonkeller <jonkeller@google.com>
Date: Wed, 11 Apr 2018 15:58:00 -0400
Subject: [PATCH] Fixes 2 unit tests

---
 .../0.1/test/test-amp-analytics.js            | 19 +++++++++++++++++--
 .../0.1/test/test-visibility-manager.js       | 15 +++++++++++----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/extensions/amp-analytics/0.1/test/test-amp-analytics.js b/extensions/amp-analytics/0.1/test/test-amp-analytics.js
index 741af0c0667b..295e66f85cfd 100644
--- a/extensions/amp-analytics/0.1/test/test-amp-analytics.js
+++ b/extensions/amp-analytics/0.1/test/test-amp-analytics.js
@@ -266,13 +266,28 @@ describes.realWin('amp-analytics', {
     }
   });
 
-  // TODO(jonkeller, #14336): Fails due to console errors.
-  it.skip('does not unnecessarily preload iframe transport script', function() {
+  it('does not unnecessarily preload iframe transport script', function() {
     const el = doc.createElement('amp-analytics');
+    el.setAttribute('type', 'foo');
     doc.body.appendChild(el);
     const analytics = new AmpAnalytics(el);
     sandbox.stub(analytics, 'assertAmpAdResourceId').callsFake(() => 'fakeId');
     const preloadSpy = sandbox.spy(analytics, 'preload');
+    sandbox.stub(analytics, 'predefinedConfig_').value(
+        {
+          'foo': {
+            'triggers': {
+              'sample_visibility_trigger': {
+                'on': 'visible',
+                'request': 'sample_visibility_request',
+              },
+            },
+            'requests': {
+              'sample_visibility_request': 'fake-request',
+            },
+          },
+        }
+    );
     analytics.buildCallback();
     analytics.preconnectCallback();
     return analytics.layoutCallback().then(() => {
diff --git a/extensions/amp-analytics/0.1/test/test-visibility-manager.js b/extensions/amp-analytics/0.1/test/test-visibility-manager.js
index b9fa2a95e1f0..cdc06c5e0127 100644
--- a/extensions/amp-analytics/0.1/test/test-visibility-manager.js
+++ b/extensions/amp-analytics/0.1/test/test-visibility-manager.js
@@ -282,14 +282,21 @@ describes.fakeWin('VisibilityManagerForDoc', {amp: true}, env => {
     root.dispose();
   });
 
-  // TODO(jonkeller, #14336): Fails due to console errors.
-  it.skip('does not allow min==max, when they are neither 0 nor 100', () => {
+  it('does not allow min==max, when they are neither 0 nor 100', () => {
     let spec = {visiblePercentageThresholds: [[50, 50]]};
-    root.listenRoot(spec, null, null, null);
+    allowConsoleError(() => {
+      // Expect user().error(TAG,
+      //   'visiblePercentageThresholds entry invalid min/max value')
+      root.listenRoot(spec, null, null, null);
+    });
     expect(root.models_).to.have.length(0);
     root.dispose();
     spec = {visiblePercentageThresholds: [[0, 10], [10, 10], [30, 30]]};
-    root.listenRoot(spec, null, null, null);
+    allowConsoleError(() => {
+      // On the [10, 10] only, again expect user().error(TAG,
+      //   'visiblePercentageThresholds entry invalid min/max value')
+      root.listenRoot(spec, null, null, null);
+    });
     expect(root.models_).to.have.length(1);
     root.dispose();
   });