From 9392fb5512fa39606d7dd03c54ae7ea593339f78 Mon Sep 17 00:00:00 2001
From: Aaron Turner <aaron@aaronthedev.com>
Date: Wed, 7 Jun 2017 14:11:53 -0700
Subject: [PATCH 01/11] Made a skeleton of all of the required files

This skeeletons all of the required files for amp-sidebar v1
---
 extensions/amp-sidebar/1.0/amp-sidebar.css    | 15 +++++++++++++++
 extensions/amp-sidebar/1.0/amp-sidebar.js     | 15 +++++++++++++++
 .../amp-sidebar/1.0/test/test-amp-sidebar.js  | 16 ++++++++++++++++
 .../1.0/test/validator-amp-sidebar.html       | 19 +++++++++++++++++++
 .../1.0/test/validator-amp-sidebar.out        |  3 +++
 .../1.0/validator-amp-sidebar.protoascii      | 15 +++++++++++++++
 6 files changed, 83 insertions(+)
 create mode 100644 extensions/amp-sidebar/1.0/amp-sidebar.css
 create mode 100644 extensions/amp-sidebar/1.0/amp-sidebar.js
 create mode 100644 extensions/amp-sidebar/1.0/test/test-amp-sidebar.js
 create mode 100644 extensions/amp-sidebar/1.0/test/validator-amp-sidebar.html
 create mode 100644 extensions/amp-sidebar/1.0/test/validator-amp-sidebar.out
 create mode 100644 extensions/amp-sidebar/1.0/validator-amp-sidebar.protoascii

diff --git a/extensions/amp-sidebar/1.0/amp-sidebar.css b/extensions/amp-sidebar/1.0/amp-sidebar.css
new file mode 100644
index 000000000000..5865c1372d1c
--- /dev/null
+++ b/extensions/amp-sidebar/1.0/amp-sidebar.css
@@ -0,0 +1,15 @@
+/**
+ * Copyright 2016 The AMP HTML 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.
+ */
diff --git a/extensions/amp-sidebar/1.0/amp-sidebar.js b/extensions/amp-sidebar/1.0/amp-sidebar.js
new file mode 100644
index 000000000000..5865c1372d1c
--- /dev/null
+++ b/extensions/amp-sidebar/1.0/amp-sidebar.js
@@ -0,0 +1,15 @@
+/**
+ * Copyright 2016 The AMP HTML 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.
+ */
diff --git a/extensions/amp-sidebar/1.0/test/test-amp-sidebar.js b/extensions/amp-sidebar/1.0/test/test-amp-sidebar.js
new file mode 100644
index 000000000000..9538d35f73b2
--- /dev/null
+++ b/extensions/amp-sidebar/1.0/test/test-amp-sidebar.js
@@ -0,0 +1,16 @@
+
+/**
+ * Copyright 2016 The AMP HTML 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.
+ */
diff --git a/extensions/amp-sidebar/1.0/test/validator-amp-sidebar.html b/extensions/amp-sidebar/1.0/test/validator-amp-sidebar.html
new file mode 100644
index 000000000000..864bc5ae2452
--- /dev/null
+++ b/extensions/amp-sidebar/1.0/test/validator-amp-sidebar.html
@@ -0,0 +1,19 @@
+<!--
+  Copyright 2015 The AMP HTML 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.
+-->
+<!--
+  Test Description:
+  Tests support for the amp-sidebar v1.0 tag.
+-->
diff --git a/extensions/amp-sidebar/1.0/test/validator-amp-sidebar.out b/extensions/amp-sidebar/1.0/test/validator-amp-sidebar.out
new file mode 100644
index 000000000000..742043975604
--- /dev/null
+++ b/extensions/amp-sidebar/1.0/test/validator-amp-sidebar.out
@@ -0,0 +1,3 @@
+FAIL
+amp-sidebar/0.1/test/validator-amp-sidebar.html:51:4 The tag 'amp-ad' may not appear as a descendant of tag 'amp-sidebar'. (see https://www.ampproject.org/docs/reference/components/amp-ad) [AMP_TAG_PROBLEM]
+amp-sidebar/0.1/test/validator-amp-sidebar.html:54:2 The attribute 'side' in tag 'amp-sidebar' is set to the invalid value 'center'. (see https://www.ampproject.org/docs/reference/components/amp-sidebar) [AMP_TAG_PROBLEM]
diff --git a/extensions/amp-sidebar/1.0/validator-amp-sidebar.protoascii b/extensions/amp-sidebar/1.0/validator-amp-sidebar.protoascii
new file mode 100644
index 000000000000..3f56139da68b
--- /dev/null
+++ b/extensions/amp-sidebar/1.0/validator-amp-sidebar.protoascii
@@ -0,0 +1,15 @@
+#
+# Copyright 2016 The AMP HTML 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.
+#

From 5cba7b562ca5f35541c68ef06827618d76d48d1c Mon Sep 17 00:00:00 2001
From: Aaron Turner <aaron@aaronthedev.com>
Date: Wed, 7 Jun 2017 14:17:26 -0700
Subject: [PATCH 02/11] Removed the test output,a nd updated the gulp file

Now the gulp file will build and look for v1.0 of sidebar
---
 extensions/amp-sidebar/1.0/test/validator-amp-sidebar.out | 3 ---
 gulpfile.js                                               | 4 +++-
 2 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 extensions/amp-sidebar/1.0/test/validator-amp-sidebar.out

diff --git a/extensions/amp-sidebar/1.0/test/validator-amp-sidebar.out b/extensions/amp-sidebar/1.0/test/validator-amp-sidebar.out
deleted file mode 100644
index 742043975604..000000000000
--- a/extensions/amp-sidebar/1.0/test/validator-amp-sidebar.out
+++ /dev/null
@@ -1,3 +0,0 @@
-FAIL
-amp-sidebar/0.1/test/validator-amp-sidebar.html:51:4 The tag 'amp-ad' may not appear as a descendant of tag 'amp-sidebar'. (see https://www.ampproject.org/docs/reference/components/amp-ad) [AMP_TAG_PROBLEM]
-amp-sidebar/0.1/test/validator-amp-sidebar.html:54:2 The attribute 'side' in tag 'amp-sidebar' is set to the invalid value 'center'. (see https://www.ampproject.org/docs/reference/components/amp-sidebar) [AMP_TAG_PROBLEM]
diff --git a/gulpfile.js b/gulpfile.js
index 8407e6f88108..b832e196584b 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -109,7 +109,7 @@ declareExtension('amp-playbuzz', '0.1', true, 'NO_TYPE_CHECK');
 declareExtension('amp-reach-player', '0.1', false);
 declareExtension('amp-reddit', '0.1', false);
 declareExtension('amp-share-tracking', '0.1', false);
-declareExtension('amp-sidebar', '0.1', true);
+declareExtension('amp-sidebar', '1.0', true);
 declareExtension('amp-soundcloud', '0.1', false);
 declareExtension('amp-springboard-player', '0.1', false);
 declareExtension('amp-sticky-ad', '1.0', true);
@@ -137,6 +137,8 @@ declareExtension('amp-viewer-integration', '0.1', {
 });
 declareExtension('amp-video', '0.1', false);
 declareExtension('amp-youtube', '0.1', false);
+declareExtensionVersionAlias(
+    'amp-sticky-ad', '0.1', /* lastestVersion */ '1.0', /* hasCss */ true);
 declareExtensionVersionAlias(
     'amp-sticky-ad', '0.1', /* lastestVersion */ '1.0', /* hasCss */ true);
 /**

From 8f8f4cf84d6f7eba4cab9d47d8b65620abda3102 Mon Sep 17 00:00:00 2001
From: Aaron Turner <aaron@aaronthedev.com>
Date: Wed, 7 Jun 2017 14:44:14 -0700
Subject: [PATCH 03/11] Added some more skeleton to the main sidebar .js file

Also, tested to ensure that the extension could be loaded and registered
successfully
---
 extensions/amp-sidebar/1.0/amp-sidebar.js | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/extensions/amp-sidebar/1.0/amp-sidebar.js b/extensions/amp-sidebar/1.0/amp-sidebar.js
index 5865c1372d1c..1810ccb7016a 100644
--- a/extensions/amp-sidebar/1.0/amp-sidebar.js
+++ b/extensions/amp-sidebar/1.0/amp-sidebar.js
@@ -13,3 +13,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+import {CSS} from '../../../build/amp-sidebar-1.0.css';
+
+export class AmpSidebar extends AMP.BaseElement {
+  /** @param {!AmpElement} element */
+  constructor(element) {
+    super(element);
+  }
+
+  /** @override */
+  isLayoutSupported(layout) {
+    return layout == Layout.NODISPLAY;
+  }
+
+  /** @override */
+  buildCallback() {
+
+  }
+}
+
+AMP.registerElement('amp-sidebar', AmpSidebar, CSS);

From 3a5dbb24e6f5f4a4419c145f80e668a84523783a Mon Sep 17 00:00:00 2001
From: Aaron Turner <aaron@aaronthedev.com>
Date: Wed, 7 Jun 2017 14:47:22 -0700
Subject: [PATCH 04/11] Updated the copyright year

Suggested by @honeybadgerdontcare
---
 extensions/amp-sidebar/1.0/amp-sidebar.css                  | 2 +-
 extensions/amp-sidebar/1.0/amp-sidebar.js                   | 2 +-
 extensions/amp-sidebar/1.0/test/test-amp-sidebar.js         | 2 +-
 extensions/amp-sidebar/1.0/test/validator-amp-sidebar.html  | 2 +-
 extensions/amp-sidebar/1.0/validator-amp-sidebar.protoascii | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/amp-sidebar/1.0/amp-sidebar.css b/extensions/amp-sidebar/1.0/amp-sidebar.css
index 5865c1372d1c..41bddeceda70 100644
--- a/extensions/amp-sidebar/1.0/amp-sidebar.css
+++ b/extensions/amp-sidebar/1.0/amp-sidebar.css
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 The AMP HTML Authors. All Rights Reserved.
+ * Copyright 2017 The AMP HTML 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.
diff --git a/extensions/amp-sidebar/1.0/amp-sidebar.js b/extensions/amp-sidebar/1.0/amp-sidebar.js
index 1810ccb7016a..e946fb8c0a27 100644
--- a/extensions/amp-sidebar/1.0/amp-sidebar.js
+++ b/extensions/amp-sidebar/1.0/amp-sidebar.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 The AMP HTML Authors. All Rights Reserved.
+ * Copyright 2017 The AMP HTML 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.
diff --git a/extensions/amp-sidebar/1.0/test/test-amp-sidebar.js b/extensions/amp-sidebar/1.0/test/test-amp-sidebar.js
index 9538d35f73b2..f47923d1a641 100644
--- a/extensions/amp-sidebar/1.0/test/test-amp-sidebar.js
+++ b/extensions/amp-sidebar/1.0/test/test-amp-sidebar.js
@@ -1,6 +1,6 @@
 
 /**
- * Copyright 2016 The AMP HTML Authors. All Rights Reserved.
+ * Copyright 2017 The AMP HTML 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.
diff --git a/extensions/amp-sidebar/1.0/test/validator-amp-sidebar.html b/extensions/amp-sidebar/1.0/test/validator-amp-sidebar.html
index 864bc5ae2452..d630f044f8ea 100644
--- a/extensions/amp-sidebar/1.0/test/validator-amp-sidebar.html
+++ b/extensions/amp-sidebar/1.0/test/validator-amp-sidebar.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2015 The AMP HTML Authors. All Rights Reserved.
+  Copyright 2017 The AMP HTML 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.
diff --git a/extensions/amp-sidebar/1.0/validator-amp-sidebar.protoascii b/extensions/amp-sidebar/1.0/validator-amp-sidebar.protoascii
index 3f56139da68b..db2858981284 100644
--- a/extensions/amp-sidebar/1.0/validator-amp-sidebar.protoascii
+++ b/extensions/amp-sidebar/1.0/validator-amp-sidebar.protoascii
@@ -1,5 +1,5 @@
 #
-# Copyright 2016 The AMP HTML Authors. All Rights Reserved.
+# Copyright 2017 The AMP HTML 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.

From 3248809b54344ee41f835538049888afe83b461f Mon Sep 17 00:00:00 2001
From: Aaron Turner <aaron@aaronthedev.com>
Date: Wed, 7 Jun 2017 15:19:36 -0700
Subject: [PATCH 05/11] Fixed Travis Linting errors

---
 extensions/amp-sidebar/1.0/amp-sidebar.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extensions/amp-sidebar/1.0/amp-sidebar.js b/extensions/amp-sidebar/1.0/amp-sidebar.js
index e946fb8c0a27..6774fa1b1b3f 100644
--- a/extensions/amp-sidebar/1.0/amp-sidebar.js
+++ b/extensions/amp-sidebar/1.0/amp-sidebar.js
@@ -15,6 +15,7 @@
  */
 
 import {CSS} from '../../../build/amp-sidebar-1.0.css';
+import {Layout} from '../../../src/layout';
 
 export class AmpSidebar extends AMP.BaseElement {
   /** @param {!AmpElement} element */

From 857f7cd24d5d3d4f72a679fb755ff09b46da1a87 Mon Sep 17 00:00:00 2001
From: Aaron Turner <aaron@aaronthedev.com>
Date: Wed, 7 Jun 2017 15:29:53 -0700
Subject: [PATCH 06/11] Fixed the typo on the alias declaration

---
 gulpfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gulpfile.js b/gulpfile.js
index b832e196584b..bfb05f00b62c 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -138,7 +138,7 @@ declareExtension('amp-viewer-integration', '0.1', {
 declareExtension('amp-video', '0.1', false);
 declareExtension('amp-youtube', '0.1', false);
 declareExtensionVersionAlias(
-    'amp-sticky-ad', '0.1', /* lastestVersion */ '1.0', /* hasCss */ true);
+    'amp-sidebar', '0.1', /* lastestVersion */ '1.0', /* hasCss */ true);
 declareExtensionVersionAlias(
     'amp-sticky-ad', '0.1', /* lastestVersion */ '1.0', /* hasCss */ true);
 /**

From adbd07d06ee7628da4c68943e089e6bb9747a8a1 Mon Sep 17 00:00:00 2001
From: Aaron Turner <aaron@aaronthedev.com>
Date: Wed, 7 Jun 2017 16:19:48 -0700
Subject: [PATCH 07/11] Adding sidebar v1 exception to the dep check

This is because of: #9642 , Was going to fix this myself, but it is
currently in PR at: #9730
---
 build-system/tasks/dep-check.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build-system/tasks/dep-check.js b/build-system/tasks/dep-check.js
index 27ea8892b9f8..82dbd0637c7a 100644
--- a/build-system/tasks/dep-check.js
+++ b/build-system/tasks/dep-check.js
@@ -203,7 +203,9 @@ function getGraph(entryModule) {
  */
 function getEntryModule(extensionFolder) {
   // TODO (@zhouyx, #9642): Remove the special check and handle more than just 0.1
-  if (extensionFolder == 'extensions/amp-sticky-ad') {
+  if (extensionFolder == 'extensions/amp-sticky-ad' ||
+    extensionFolder == 'extensions/amp-sidebar'
+  ) {
     return `${extensionFolder}/1.0/${path.basename(extensionFolder)}.js`;
   }
   return `${extensionFolder}/0.1/${path.basename(extensionFolder)}.js`;

From ce2b1eaac5fd5093856236fd7ba085f9d4fd5bb1 Mon Sep 17 00:00:00 2001
From: Aaron Turner <aaron@aaronthedev.com>
Date: Wed, 7 Jun 2017 16:33:37 -0700
Subject: [PATCH 08/11] Fixed PR comments

Was my error in not realizing alias'ing was done for deprecated
extensions
---
 build-system/tasks/dep-check.js | 4 +---
 gulpfile.js                     | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/build-system/tasks/dep-check.js b/build-system/tasks/dep-check.js
index 82dbd0637c7a..27ea8892b9f8 100644
--- a/build-system/tasks/dep-check.js
+++ b/build-system/tasks/dep-check.js
@@ -203,9 +203,7 @@ function getGraph(entryModule) {
  */
 function getEntryModule(extensionFolder) {
   // TODO (@zhouyx, #9642): Remove the special check and handle more than just 0.1
-  if (extensionFolder == 'extensions/amp-sticky-ad' ||
-    extensionFolder == 'extensions/amp-sidebar'
-  ) {
+  if (extensionFolder == 'extensions/amp-sticky-ad') {
     return `${extensionFolder}/1.0/${path.basename(extensionFolder)}.js`;
   }
   return `${extensionFolder}/0.1/${path.basename(extensionFolder)}.js`;
diff --git a/gulpfile.js b/gulpfile.js
index bfb05f00b62c..d651cd6d4fac 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -109,6 +109,7 @@ declareExtension('amp-playbuzz', '0.1', true, 'NO_TYPE_CHECK');
 declareExtension('amp-reach-player', '0.1', false);
 declareExtension('amp-reddit', '0.1', false);
 declareExtension('amp-share-tracking', '0.1', false);
+declareExtension('amp-sidebar', '0.1', true);
 declareExtension('amp-sidebar', '1.0', true);
 declareExtension('amp-soundcloud', '0.1', false);
 declareExtension('amp-springboard-player', '0.1', false);
@@ -137,8 +138,6 @@ declareExtension('amp-viewer-integration', '0.1', {
 });
 declareExtension('amp-video', '0.1', false);
 declareExtension('amp-youtube', '0.1', false);
-declareExtensionVersionAlias(
-    'amp-sidebar', '0.1', /* lastestVersion */ '1.0', /* hasCss */ true);
 declareExtensionVersionAlias(
     'amp-sticky-ad', '0.1', /* lastestVersion */ '1.0', /* hasCss */ true);
 /**

From 6883834acf9848994c1de10ec75b561f21d170c2 Mon Sep 17 00:00:00 2001
From: Aaron Turner <aaron@aaronthedev.com>
Date: Wed, 7 Jun 2017 17:03:53 -0700
Subject: [PATCH 09/11] Added a note about declareExtensionVersionAlias, and
 declared versions in JS

---
 extensions/amp-sidebar/0.1/amp-sidebar.js | 4 +++-
 extensions/amp-sidebar/1.0/amp-sidebar.js | 4 +++-
 gulpfile.js                               | 4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/extensions/amp-sidebar/0.1/amp-sidebar.js b/extensions/amp-sidebar/0.1/amp-sidebar.js
index bf1cff887d05..160534b66d7c 100644
--- a/extensions/amp-sidebar/0.1/amp-sidebar.js
+++ b/extensions/amp-sidebar/0.1/amp-sidebar.js
@@ -323,4 +323,6 @@ export class AmpSidebar extends AMP.BaseElement {
   }
 }
 
-AMP.registerElement('amp-sidebar', AmpSidebar, CSS);
+AMP.extension('amp-sidebar', '0.1', AMP => {
+  AMP.registerElement('amp-sidebar', AmpSidebar, CSS);
+});
diff --git a/extensions/amp-sidebar/1.0/amp-sidebar.js b/extensions/amp-sidebar/1.0/amp-sidebar.js
index 6774fa1b1b3f..f333b51f320b 100644
--- a/extensions/amp-sidebar/1.0/amp-sidebar.js
+++ b/extensions/amp-sidebar/1.0/amp-sidebar.js
@@ -34,4 +34,6 @@ export class AmpSidebar extends AMP.BaseElement {
   }
 }
 
-AMP.registerElement('amp-sidebar', AmpSidebar, CSS);
+AMP.extension('amp-sidebar', '1.0', AMP => {
+  AMP.registerElement('amp-sidebar', AmpSidebar, CSS);
+});
diff --git a/gulpfile.js b/gulpfile.js
index d651cd6d4fac..9f6b25e37da2 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -168,6 +168,10 @@ function declareExtension(name, version, hasCssOrOptions, opt_noTypeCheck,
 }
 
 /**
+ * This function is used for declaring deprecated extensions. It simply places the current
+ * version code in place of the latest versions.
+ * This has the ability to break an extension verison, so please be sure that this is
+ * the correct to use.
  * @param {string} name
  * @param {string} version E.g. 0.1
  * @param {string} lastestVersion

From 6a062783dd5c8514f6178ca54f901f6fa99580c0 Mon Sep 17 00:00:00 2001
From: Aaron Turner <aaron@aaronthedev.com>
Date: Thu, 8 Jun 2017 10:54:44 -0700
Subject: [PATCH 10/11] Fixed Sidebar 0.1 tests

Needed a different way of building the window since we are now
introducing versioning to amp-sidebar
---
 .../amp-sidebar/0.1/test/test-amp-sidebar.js  | 877 +++++++++---------
 1 file changed, 445 insertions(+), 432 deletions(-)

diff --git a/extensions/amp-sidebar/0.1/test/test-amp-sidebar.js b/extensions/amp-sidebar/0.1/test/test-amp-sidebar.js
index ffabba666e85..a9b201699834 100644
--- a/extensions/amp-sidebar/0.1/test/test-amp-sidebar.js
+++ b/extensions/amp-sidebar/0.1/test/test-amp-sidebar.js
@@ -26,505 +26,518 @@ import '../amp-sidebar';
 
 adopt(window);
 
-describe('amp-sidebar', () => {
-  let sandbox;
-  let platform;
-  let timer;
+describes.realWin('amp-sidebar 0.1 version', {
+  win: { /* window spec */
+    location: '...',
+    historyOff: false,
+  },
+  amp: { /* amp spec */
+    runtimeOn: false,
+    extensions: ['amp-sidebar:0.1'],
+  },
+}, () => {
+  describe('amp-sidebar', () => {
+    let sandbox;
+    let platform;
+    let timer;
 
-  function getAmpSidebar(options) {
-    options = options || {};
-    return createIframePromise().then(iframe => {
-      const ampSidebar = iframe.doc.createElement('amp-sidebar');
-      const list = iframe.doc.createElement('ul');
-      for (let i = 0; i < 10; i++) {
-        const li = iframe.doc.createElement('li');
-        li.innerHTML = 'Menu item ' + i;
-        list.appendChild(li);
-      }
-      ampSidebar.appendChild(list);
-      const anchor = iframe.doc.createElement('a');
-      anchor.href = '#section1';
-      ampSidebar.appendChild(anchor);
-      if (options.side) {
-        ampSidebar.setAttribute('side', options.side);
-      }
-      if (options.open) {
-        ampSidebar.setAttribute('open', '');
-      }
-      ampSidebar.setAttribute('id', 'sidebar1');
-      ampSidebar.setAttribute('layout', 'nodisplay');
-      return iframe.addElement(ampSidebar).then(() => {
-        timer = timerFor(iframe.win);
-        return {iframe, ampSidebar};
+    function getAmpSidebar(options) {
+      options = options || {};
+      return createIframePromise().then(iframe => {
+        const ampSidebar = iframe.doc.createElement('amp-sidebar');
+        const list = iframe.doc.createElement('ul');
+        for (let i = 0; i < 10; i++) {
+          const li = iframe.doc.createElement('li');
+          li.innerHTML = 'Menu item ' + i;
+          list.appendChild(li);
+        }
+        ampSidebar.appendChild(list);
+        const anchor = iframe.doc.createElement('a');
+        anchor.href = '#section1';
+        ampSidebar.appendChild(anchor);
+        if (options.side) {
+          ampSidebar.setAttribute('side', options.side);
+        }
+        if (options.open) {
+          ampSidebar.setAttribute('open', '');
+        }
+        ampSidebar.setAttribute('id', 'sidebar1');
+        ampSidebar.setAttribute('layout', 'nodisplay');
+        return iframe.addElement(ampSidebar).then(() => {
+          timer = timerFor(iframe.win);
+          return {iframe, ampSidebar};
+        });
       });
-    });
-  }
+    }
 
-  beforeEach(() => {
-    sandbox = sinon.sandbox.create();
-    platform = platformFor(window);
-  });
+    beforeEach(() => {
+      sandbox = sinon.sandbox.create();
+      platform = platformFor(window);
+    });
 
-  afterEach(() => {
-    sandbox.restore();
-  });
+    afterEach(() => {
+      sandbox.restore();
+    });
 
-  it('should open from left is side is not specified', () => {
-    return getAmpSidebar().then(obj => {
-      const sidebarElement = obj.ampSidebar;
-      expect(sidebarElement.getAttribute('side')).to.equal('left');
+    it('should open from left is side is not specified', () => {
+      return getAmpSidebar().then(obj => {
+        const sidebarElement = obj.ampSidebar;
+        expect(sidebarElement.getAttribute('side')).to.equal('left');
+      });
     });
-  });
 
-  it('should open from right is side right is specified', () => {
-    return getAmpSidebar({'side': 'right'}).then(obj => {
-      const sidebarElement = obj.ampSidebar;
-      expect(sidebarElement.getAttribute('side')).to.equal('right');
+    it('should open from right is side right is specified', () => {
+      return getAmpSidebar({'side': 'right'}).then(obj => {
+        const sidebarElement = obj.ampSidebar;
+        expect(sidebarElement.getAttribute('side')).to.equal('right');
+      });
     });
-  });
 
-  it('should create mask element in DOM', () => {
-    return getAmpSidebar().then(obj => {
-      const iframe = obj.iframe;
-      const sidebarElement = obj.ampSidebar;
-      const impl = sidebarElement.implementation_;
-      impl.vsync_ = {
-        mutate: function(callback) {
+    it('should create mask element in DOM', () => {
+      return getAmpSidebar().then(obj => {
+        const iframe = obj.iframe;
+        const sidebarElement = obj.ampSidebar;
+        const impl = sidebarElement.implementation_;
+        impl.vsync_ = {
+          mutate: function(callback) {
+            callback();
+          },
+        };
+        sandbox.stub(timer, 'delay', function(callback) {
           callback();
-        },
-      };
-      sandbox.stub(timer, 'delay', function(callback) {
-        callback();
+        });
+        impl.open_();
+        expect(iframe.doc.querySelectorAll('.i-amphtml-sidebar-mask').length)
+            .to.equal(1);
       });
-      impl.open_();
-      expect(iframe.doc.querySelectorAll('.i-amphtml-sidebar-mask').length)
-          .to.equal(1);
     });
-  });
 
-  it('should create an invisible close button for screen readers only', () => {
-    return getAmpSidebar().then(obj => {
-      const sidebarElement = obj.ampSidebar;
-      const impl = sidebarElement.implementation_;
-      impl.close_ = sandbox.spy();
-      const closeButton = sidebarElement.lastElementChild;
-      expect(closeButton).to.exist;
-      expect(closeButton.tagName).to.equal('BUTTON');
-      assertScreenReaderElement(closeButton);
-      expect(impl.close_).to.have.not.been.called;
-      closeButton.click();
-      expect(impl.close_).to.be.calledOnce;
+    it('should create an invisible close \
+    button for screen readers only', () => {
+      return getAmpSidebar().then(obj => {
+        const sidebarElement = obj.ampSidebar;
+        const impl = sidebarElement.implementation_;
+        impl.close_ = sandbox.spy();
+        const closeButton = sidebarElement.lastElementChild;
+        expect(closeButton).to.exist;
+        expect(closeButton.tagName).to.equal('BUTTON');
+        assertScreenReaderElement(closeButton);
+        expect(impl.close_).to.have.not.been.called;
+        closeButton.click();
+        expect(impl.close_).to.be.calledOnce;
+      });
     });
-  });
 
-  it('should open sidebar on button click', () => {
-    return getAmpSidebar().then(obj => {
-      const sidebarElement = obj.ampSidebar;
-      const impl = sidebarElement.implementation_;
-      const historyPushSpy = sandbox.spy();
-      const historyPopSpy = sandbox.spy();
-      impl.scheduleLayout = sandbox.spy();
-      impl.getHistory_ = function() {
-        return {
-          push: function() {
-            historyPushSpy();
-            return Promise.resolve(11);
-          },
-          pop: function() {
-            historyPopSpy();
-            return Promise.resolve(11);
+    it('should open sidebar on button click', () => {
+      return getAmpSidebar().then(obj => {
+        const sidebarElement = obj.ampSidebar;
+        const impl = sidebarElement.implementation_;
+        const historyPushSpy = sandbox.spy();
+        const historyPopSpy = sandbox.spy();
+        impl.scheduleLayout = sandbox.spy();
+        impl.getHistory_ = function() {
+          return {
+            push: function() {
+              historyPushSpy();
+              return Promise.resolve(11);
+            },
+            pop: function() {
+              historyPopSpy();
+              return Promise.resolve(11);
+            },
+          };
+        };
+        impl.vsync_ = {
+          mutate: function(callback) {
+            callback();
           },
         };
-      };
-      impl.vsync_ = {
-        mutate: function(callback) {
+        sandbox.stub(timer, 'delay', function(callback) {
           callback();
-        },
-      };
-      sandbox.stub(timer, 'delay', function(callback) {
-        callback();
-      });
-      timer.cancel = sandbox.spy();
-      impl.openOrCloseTimeOut_ = 10;
+        });
+        timer.cancel = sandbox.spy();
+        impl.openOrCloseTimeOut_ = 10;
 
-      impl.open_();
-      expect(sidebarElement.hasAttribute('open')).to.be.true;
-      expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-      expect(sidebarElement.getAttribute('role')).to.equal('menu');
-      expect(obj.iframe.doc.activeElement).to.equal(sidebarElement);
-      expect(sidebarElement.style.display).to.equal('');
-      expect(timer.cancel).to.be.calledOnce;
-      expect(impl.scheduleLayout).to.be.calledOnce;
-      expect(historyPushSpy).to.be.calledOnce;
-      expect(historyPopSpy).to.have.not.been.called;
-      expect(impl.historyId_).to.not.equal('-1');
+        impl.open_();
+        expect(sidebarElement.hasAttribute('open')).to.be.true;
+        expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
+        expect(sidebarElement.getAttribute('role')).to.equal('menu');
+        expect(obj.iframe.doc.activeElement).to.equal(sidebarElement);
+        expect(sidebarElement.style.display).to.equal('');
+        expect(timer.cancel).to.be.calledOnce;
+        expect(impl.scheduleLayout).to.be.calledOnce;
+        expect(historyPushSpy).to.be.calledOnce;
+        expect(historyPopSpy).to.have.not.been.called;
+        expect(impl.historyId_).to.not.equal('-1');
 
-      // second call to open_() should be a no-op and not increase call counts.
-      impl.open_();
-      expect(impl.scheduleLayout).to.be.calledOnce;
-      expect(historyPushSpy).to.be.calledOnce;
-      expect(historyPopSpy).to.have.not.been.called;
+        // second call to open_() should be a no-op and not increase call counts.
+        impl.open_();
+        expect(impl.scheduleLayout).to.be.calledOnce;
+        expect(historyPushSpy).to.be.calledOnce;
+        expect(historyPopSpy).to.have.not.been.called;
 
+      });
     });
-  });
 
-  it('should close sidebar on button click', () => {
-    return getAmpSidebar({'open': true}).then(obj => {
-      const sidebarElement = obj.ampSidebar;
-      const impl = sidebarElement.implementation_;
-      impl.schedulePause = sandbox.spy();
-      const historyPushSpy = sandbox.spy();
-      const historyPopSpy = sandbox.spy();
-      impl.scheduleLayout = sandbox.spy();
-      impl.getHistory_ = function() {
-        return {
-          push: function() {
-            historyPushSpy();
-            return Promise.resolve(11);
-          },
-          pop: function() {
-            historyPopSpy();
-            return Promise.resolve(11);
+    it('should close sidebar on button click', () => {
+      return getAmpSidebar({'open': true}).then(obj => {
+        const sidebarElement = obj.ampSidebar;
+        const impl = sidebarElement.implementation_;
+        impl.schedulePause = sandbox.spy();
+        const historyPushSpy = sandbox.spy();
+        const historyPopSpy = sandbox.spy();
+        impl.scheduleLayout = sandbox.spy();
+        impl.getHistory_ = function() {
+          return {
+            push: function() {
+              historyPushSpy();
+              return Promise.resolve(11);
+            },
+            pop: function() {
+              historyPopSpy();
+              return Promise.resolve(11);
+            },
+          };
+        };
+        impl.historyId_ = 100;
+        impl.vsync_ = {
+          mutate: function(callback) {
+            callback();
           },
         };
-      };
-      impl.historyId_ = 100;
-      impl.vsync_ = {
-        mutate: function(callback) {
+        sandbox.stub(timer, 'delay', function(callback) {
           callback();
-        },
-      };
-      sandbox.stub(timer, 'delay', function(callback) {
-        callback();
-      });
+        });
 
-      timer.cancel = sandbox.spy();
-      impl.openOrCloseTimeOut_ = 10;
-      impl.close_();
-      expect(sidebarElement.hasAttribute('open')).to.be.false;
-      expect(sidebarElement.getAttribute('aria-hidden')).to.equal('true');
-      expect(sidebarElement.style.display).to.equal('none');
-      expect(timer.cancel).to.be.calledOnce;
-      expect(impl.schedulePause).to.be.calledOnce;
-      expect(historyPopSpy).to.be.calledOnce;
-      expect(impl.historyId_).to.equal(-1);
+        timer.cancel = sandbox.spy();
+        impl.openOrCloseTimeOut_ = 10;
+        impl.close_();
+        expect(sidebarElement.hasAttribute('open')).to.be.false;
+        expect(sidebarElement.getAttribute('aria-hidden')).to.equal('true');
+        expect(sidebarElement.style.display).to.equal('none');
+        expect(timer.cancel).to.be.calledOnce;
+        expect(impl.schedulePause).to.be.calledOnce;
+        expect(historyPopSpy).to.be.calledOnce;
+        expect(impl.historyId_).to.equal(-1);
 
-      // second call to close_() should be a no-op and not increase call counts.
-      impl.close_();
-      expect(impl.schedulePause).to.be.calledOnce;
-      expect(historyPopSpy).to.be.calledOnce;
+        // second call to close_() should be a no-op and not increase call counts.
+        impl.close_();
+        expect(impl.schedulePause).to.be.calledOnce;
+        expect(historyPopSpy).to.be.calledOnce;
+      });
     });
-  });
 
-  it('should toggle sidebar on button click', () => {
-    return getAmpSidebar().then(obj => {
-      const sidebarElement = obj.ampSidebar;
-      const impl = sidebarElement.implementation_;
-      impl.scheduleLayout = sandbox.spy();
-      impl.schedulePause = sandbox.spy();
-      impl.vsync_ = {
-        mutate: function(callback) {
+    it('should toggle sidebar on button click', () => {
+      return getAmpSidebar().then(obj => {
+        const sidebarElement = obj.ampSidebar;
+        const impl = sidebarElement.implementation_;
+        impl.scheduleLayout = sandbox.spy();
+        impl.schedulePause = sandbox.spy();
+        impl.vsync_ = {
+          mutate: function(callback) {
+            callback();
+          },
+        };
+        sandbox.stub(timer, 'delay', function(callback) {
           callback();
-        },
-      };
-      sandbox.stub(timer, 'delay', function(callback) {
-        callback();
+        });
+        expect(sidebarElement.hasAttribute('open')).to.be.false;
+        expect(sidebarElement.getAttribute('aria-hidden')).to.equal('true');
+        expect(sidebarElement.getAttribute('role')).to.equal('menu');
+        expect(obj.iframe.doc.activeElement).to.not.equal(sidebarElement);
+        impl.toggle_();
+        expect(sidebarElement.hasAttribute('open')).to.be.true;
+        expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
+        expect(obj.iframe.doc.activeElement).to.equal(sidebarElement);
+        expect(sidebarElement.style.display).to.equal('');
+        expect(impl.scheduleLayout).to.be.calledOnce;
+        impl.toggle_();
+        expect(sidebarElement.hasAttribute('open')).to.be.false;
+        expect(sidebarElement.getAttribute('aria-hidden')).to.equal('true');
+        expect(sidebarElement.style.display).to.equal('none');
+        expect(impl.schedulePause).to.be.calledOnce;
       });
-      expect(sidebarElement.hasAttribute('open')).to.be.false;
-      expect(sidebarElement.getAttribute('aria-hidden')).to.equal('true');
-      expect(sidebarElement.getAttribute('role')).to.equal('menu');
-      expect(obj.iframe.doc.activeElement).to.not.equal(sidebarElement);
-      impl.toggle_();
-      expect(sidebarElement.hasAttribute('open')).to.be.true;
-      expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-      expect(obj.iframe.doc.activeElement).to.equal(sidebarElement);
-      expect(sidebarElement.style.display).to.equal('');
-      expect(impl.scheduleLayout).to.be.calledOnce;
-      impl.toggle_();
-      expect(sidebarElement.hasAttribute('open')).to.be.false;
-      expect(sidebarElement.getAttribute('aria-hidden')).to.equal('true');
-      expect(sidebarElement.style.display).to.equal('none');
-      expect(impl.schedulePause).to.be.calledOnce;
     });
-  });
 
-  it('should close sidebar on escape', () => {
-    return getAmpSidebar().then(obj => {
-      const iframe = obj.iframe;
-      const sidebarElement = obj.ampSidebar;
-      const impl = sidebarElement.implementation_;
-      impl.schedulePause = sandbox.spy();
-      impl.vsync_ = {
-        mutate: function(callback) {
+    it('should close sidebar on escape', () => {
+      return getAmpSidebar().then(obj => {
+        const iframe = obj.iframe;
+        const sidebarElement = obj.ampSidebar;
+        const impl = sidebarElement.implementation_;
+        impl.schedulePause = sandbox.spy();
+        impl.vsync_ = {
+          mutate: function(callback) {
+            callback();
+          },
+        };
+        sandbox.stub(timer, 'delay', function(callback) {
           callback();
-        },
-      };
-      sandbox.stub(timer, 'delay', function(callback) {
-        callback();
+        });
+        expect(sidebarElement.hasAttribute('open')).to.be.false;
+        impl.open_();
+        expect(sidebarElement.hasAttribute('open')).to.be.true;
+        expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
+        const eventObj = document.createEventObject ?
+            document.createEventObject() : document.createEvent('Events');
+        if (eventObj.initEvent) {
+          eventObj.initEvent('keydown', true, true);
+        }
+        eventObj.keyCode = KeyCodes.ESCAPE;
+        eventObj.which = KeyCodes.ESCAPE;
+        const el = iframe.doc.documentElement;
+        el.dispatchEvent ?
+            el.dispatchEvent(eventObj) : el.fireEvent('onkeydown', eventObj);
+        expect(sidebarElement.hasAttribute('open')).to.be.false;
+        expect(sidebarElement.getAttribute('aria-hidden')).to.equal('true');
+        expect(sidebarElement.style.display).to.equal('none');
+        expect(impl.schedulePause).to.be.calledOnce;
       });
-      expect(sidebarElement.hasAttribute('open')).to.be.false;
-      impl.open_();
-      expect(sidebarElement.hasAttribute('open')).to.be.true;
-      expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-      const eventObj = document.createEventObject ?
-          document.createEventObject() : document.createEvent('Events');
-      if (eventObj.initEvent) {
-        eventObj.initEvent('keydown', true, true);
-      }
-      eventObj.keyCode = KeyCodes.ESCAPE;
-      eventObj.which = KeyCodes.ESCAPE;
-      const el = iframe.doc.documentElement;
-      el.dispatchEvent ?
-          el.dispatchEvent(eventObj) : el.fireEvent('onkeydown', eventObj);
-      expect(sidebarElement.hasAttribute('open')).to.be.false;
-      expect(sidebarElement.getAttribute('aria-hidden')).to.equal('true');
-      expect(sidebarElement.style.display).to.equal('none');
-      expect(impl.schedulePause).to.be.calledOnce;
     });
-  });
 
-  it('should reflect state of the sidebar', () => {
-    return getAmpSidebar().then(obj => {
-      const sidebarElement = obj.ampSidebar;
-      const impl = sidebarElement.implementation_;
-      impl.schedulePause = sandbox.spy();
-      impl.scheduleResume = sandbox.spy();
-      impl.vsync_ = {
-        mutate: function(callback) {
+    it('should reflect state of the sidebar', () => {
+      return getAmpSidebar().then(obj => {
+        const sidebarElement = obj.ampSidebar;
+        const impl = sidebarElement.implementation_;
+        impl.schedulePause = sandbox.spy();
+        impl.scheduleResume = sandbox.spy();
+        impl.vsync_ = {
+          mutate: function(callback) {
+            callback();
+          },
+        };
+        sandbox.stub(timer, 'delay', function(callback) {
           callback();
-        },
-      };
-      sandbox.stub(timer, 'delay', function(callback) {
-        callback();
+        });
+        expect(impl.isOpen_()).to.be.false;
+        expect(impl.schedulePause).to.have.not.been.called;
+        expect(impl.scheduleResume).to.have.not.been.called;
+        impl.toggle_();
+        expect(impl.isOpen_()).to.be.true;
+        expect(impl.schedulePause).to.have.not.been.called;
+        expect(impl.scheduleResume).to.be.calledOnce;
+        impl.toggle_();
+        expect(impl.isOpen_()).to.be.false;
+        expect(impl.schedulePause).to.be.calledOnce;
+        expect(impl.scheduleResume).to.be.calledOnce;
+        impl.toggle_();
+        expect(impl.isOpen_()).to.be.true;
+        expect(impl.schedulePause).to.be.calledOnce;
+        expect(impl.scheduleResume).to.have.callCount(2);
+        impl.toggle_();
+        expect(impl.isOpen_()).to.be.false;
+        expect(impl.schedulePause).to.have.callCount(2);
+        expect(impl.scheduleResume).to.have.callCount(2);
       });
-      expect(impl.isOpen_()).to.be.false;
-      expect(impl.schedulePause).to.have.not.been.called;
-      expect(impl.scheduleResume).to.have.not.been.called;
-      impl.toggle_();
-      expect(impl.isOpen_()).to.be.true;
-      expect(impl.schedulePause).to.have.not.been.called;
-      expect(impl.scheduleResume).to.be.calledOnce;
-      impl.toggle_();
-      expect(impl.isOpen_()).to.be.false;
-      expect(impl.schedulePause).to.be.calledOnce;
-      expect(impl.scheduleResume).to.be.calledOnce;
-      impl.toggle_();
-      expect(impl.isOpen_()).to.be.true;
-      expect(impl.schedulePause).to.be.calledOnce;
-      expect(impl.scheduleResume).to.have.callCount(2);
-      impl.toggle_();
-      expect(impl.isOpen_()).to.be.false;
-      expect(impl.schedulePause).to.have.callCount(2);
-      expect(impl.scheduleResume).to.have.callCount(2);
     });
-  });
 
-  it.skip('should fix scroll leaks on ios safari', () => {
-    sandbox.stub(platform, 'isIos').returns(true);
-    sandbox.stub(platform, 'isSafari').returns(true);
-    return getAmpSidebar().then(obj => {
-      const sidebarElement = obj.ampSidebar;
-      const impl = sidebarElement.implementation_;
-      impl.vsync_ = {
-        mutate: function(callback) {
+    it.skip('should fix scroll leaks on ios safari', () => {
+      sandbox.stub(platform, 'isIos').returns(true);
+      sandbox.stub(platform, 'isSafari').returns(true);
+      return getAmpSidebar().then(obj => {
+        const sidebarElement = obj.ampSidebar;
+        const impl = sidebarElement.implementation_;
+        impl.vsync_ = {
+          mutate: function(callback) {
+            callback();
+          },
+        };
+        sandbox.stub(timer, 'delay', function(callback) {
           callback();
-        },
-      };
-      sandbox.stub(timer, 'delay', function(callback) {
-        callback();
+        });
+        const scrollLeakSpy = sandbox.spy(impl, 'fixIosElasticScrollLeak_');
+        impl.buildCallback();
+        expect(scrollLeakSpy).to.be.calledOnce;
       });
-      const scrollLeakSpy = sandbox.spy(impl, 'fixIosElasticScrollLeak_');
-      impl.buildCallback();
-      expect(scrollLeakSpy).to.be.calledOnce;
     });
-  });
 
-  it.skip('should adjust for IOS safari bottom bar', () => {
-    sandbox.stub(platform, 'isIos').returns(true);
-    sandbox.stub(platform, 'isSafari').returns(true);
-    return getAmpSidebar().then(obj => {
-      const sidebarElement = obj.ampSidebar;
-      const impl = sidebarElement.implementation_;
-      impl.vsync_ = {
-        mutate: function(callback) {
+    it.skip('should adjust for IOS safari bottom bar', () => {
+      sandbox.stub(platform, 'isIos').returns(true);
+      sandbox.stub(platform, 'isSafari').returns(true);
+      return getAmpSidebar().then(obj => {
+        const sidebarElement = obj.ampSidebar;
+        const impl = sidebarElement.implementation_;
+        impl.vsync_ = {
+          mutate: function(callback) {
+            callback();
+          },
+        };
+        sandbox.stub(timer, 'delay', function(callback) {
           callback();
-        },
-      };
-      sandbox.stub(timer, 'delay', function(callback) {
-        callback();
+        });
+        const compensateIosBottombarSpy =
+            sandbox.spy(impl, 'compensateIosBottombar_');
+        const initalChildrenCount = sidebarElement.children.length;
+        impl.open_();
+        expect(compensateIosBottombarSpy).to.be.calledOnce;
+        // 10 lis + one top padding element inserted
+        expect(sidebarElement.children.length)
+          .to.equal(initalChildrenCount + 1);
       });
-      const compensateIosBottombarSpy =
-          sandbox.spy(impl, 'compensateIosBottombar_');
-      const initalChildrenCount = sidebarElement.children.length;
-      impl.open_();
-      expect(compensateIosBottombarSpy).to.be.calledOnce;
-      // 10 lis + one top padding element inserted
-      expect(sidebarElement.children.length).to.equal(initalChildrenCount + 1);
     });
-  });
 
-  it('should close sidebar if clicked on a non-local anchor', () => {
-    return getAmpSidebar().then(obj => {
-      const sidebarElement = obj.ampSidebar;
-      const anchor = sidebarElement.getElementsByTagName('a')[0];
-      anchor.href = '#newloc';
-      const impl = sidebarElement.implementation_;
-      impl.schedulePause = sandbox.spy();
-      impl.vsync_ = {
-        mutate: function(callback) {
-          callback();
-        },
-      };
-      sandbox.stub(timer, 'delay', function(callback) {
-        callback();
-      });
-      expect(sidebarElement.hasAttribute('open')).to.be.false;
-      impl.open_();
-      expect(sidebarElement.hasAttribute('open')).to.be.true;
-      expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-      const eventObj = document.createEventObject ?
-          document.createEventObject() : document.createEvent('Events');
-      if (eventObj.initEvent) {
-        eventObj.initEvent('click', true, true);
-      }
-      sandbox.stub(sidebarElement, 'getAmpDoc', () => {
-        return {
-          win: {
-            location: {
-              href: window.location.href,
-            },
+    it('should close sidebar if clicked on a non-local anchor', () => {
+      return getAmpSidebar().then(obj => {
+        const sidebarElement = obj.ampSidebar;
+        const anchor = sidebarElement.getElementsByTagName('a')[0];
+        anchor.href = '#newloc';
+        const impl = sidebarElement.implementation_;
+        impl.schedulePause = sandbox.spy();
+        impl.vsync_ = {
+          mutate: function(callback) {
+            callback();
           },
         };
+        sandbox.stub(timer, 'delay', function(callback) {
+          callback();
+        });
+        expect(sidebarElement.hasAttribute('open')).to.be.false;
+        impl.open_();
+        expect(sidebarElement.hasAttribute('open')).to.be.true;
+        expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
+        const eventObj = document.createEventObject ?
+            document.createEventObject() : document.createEvent('Events');
+        if (eventObj.initEvent) {
+          eventObj.initEvent('click', true, true);
+        }
+        sandbox.stub(sidebarElement, 'getAmpDoc', () => {
+          return {
+            win: {
+              location: {
+                href: window.location.href,
+              },
+            },
+          };
+        });
+        anchor.dispatchEvent ?
+            anchor.dispatchEvent(eventObj) :
+            anchor.fireEvent('onkeydown', eventObj);
+        expect(sidebarElement.hasAttribute('open')).to.be.false;
+        expect(sidebarElement.getAttribute('aria-hidden')).to.equal('true');
+        expect(sidebarElement.style.display).to.equal('none');
+        expect(impl.schedulePause).to.be.calledOnce;
       });
-      anchor.dispatchEvent ?
-          anchor.dispatchEvent(eventObj) :
-          anchor.fireEvent('onkeydown', eventObj);
-      expect(sidebarElement.hasAttribute('open')).to.be.false;
-      expect(sidebarElement.getAttribute('aria-hidden')).to.equal('true');
-      expect(sidebarElement.style.display).to.equal('none');
-      expect(impl.schedulePause).to.be.calledOnce;
     });
-  });
 
-  it('should not close sidebar if clicked on a new origin navigation', () => {
-    return getAmpSidebar().then(obj => {
-      const sidebarElement = obj.ampSidebar;
-      const anchor = sidebarElement.getElementsByTagName('a')[0];
-      anchor.href = '#newloc';
-      const impl = sidebarElement.implementation_;
-      impl.schedulePause = sandbox.spy();
-      impl.vsync_ = {
-        mutate: function(callback) {
-          callback();
-        },
-      };
-      sandbox.stub(timer, 'delay', function(callback) {
-        callback();
-      });
-      expect(sidebarElement.hasAttribute('open')).to.be.false;
-      impl.open_();
-      expect(sidebarElement.hasAttribute('open')).to.be.true;
-      expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-      const eventObj = document.createEventObject ?
-          document.createEventObject() : document.createEvent('Events');
-      if (eventObj.initEvent) {
-        eventObj.initEvent('click', true, true);
-      }
-      sandbox.stub(sidebarElement, 'getAmpDoc', () => {
-        return {
-          win: {
-            location: {
-              // Mocking navigating from example.com -> localhost:9876
-              href: 'http://example.com',
-            },
+    it('should not close sidebar if clicked on a new origin navigation', () => {
+      return getAmpSidebar().then(obj => {
+        const sidebarElement = obj.ampSidebar;
+        const anchor = sidebarElement.getElementsByTagName('a')[0];
+        anchor.href = '#newloc';
+        const impl = sidebarElement.implementation_;
+        impl.schedulePause = sandbox.spy();
+        impl.vsync_ = {
+          mutate: function(callback) {
+            callback();
           },
         };
+        sandbox.stub(timer, 'delay', function(callback) {
+          callback();
+        });
+        expect(sidebarElement.hasAttribute('open')).to.be.false;
+        impl.open_();
+        expect(sidebarElement.hasAttribute('open')).to.be.true;
+        expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
+        const eventObj = document.createEventObject ?
+            document.createEventObject() : document.createEvent('Events');
+        if (eventObj.initEvent) {
+          eventObj.initEvent('click', true, true);
+        }
+        sandbox.stub(sidebarElement, 'getAmpDoc', () => {
+          return {
+            win: {
+              location: {
+                // Mocking navigating from example.com -> localhost:9876
+                href: 'http://example.com',
+              },
+            },
+          };
+        });
+        anchor.dispatchEvent ?
+            anchor.dispatchEvent(eventObj) :
+            anchor.fireEvent('onkeydown', eventObj);
+        expect(sidebarElement.hasAttribute('open')).to.be.true;
+        expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
+        expect(sidebarElement.style.display).to.equal('');
+        expect(impl.schedulePause).to.have.not.been.called;
       });
-      anchor.dispatchEvent ?
-          anchor.dispatchEvent(eventObj) :
-          anchor.fireEvent('onkeydown', eventObj);
-      expect(sidebarElement.hasAttribute('open')).to.be.true;
-      expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-      expect(sidebarElement.style.display).to.equal('');
-      expect(impl.schedulePause).to.have.not.been.called;
     });
-  });
 
-  it('should not close sidebar if clicked on new page navigation', () => {
-    return getAmpSidebar().then(obj => {
-      const sidebarElement = obj.ampSidebar;
-      const anchor = sidebarElement.getElementsByTagName('a')[0];
-      anchor.href = '#newloc';
-      const impl = sidebarElement.implementation_;
-      impl.schedulePause = sandbox.spy();
-      impl.vsync_ = {
-        mutate: function(callback) {
-          callback();
-        },
-      };
-      sandbox.stub(timer, 'delay', function(callback) {
-        callback();
-      });
-      expect(sidebarElement.hasAttribute('open')).to.be.false;
-      impl.open_();
-      expect(sidebarElement.hasAttribute('open')).to.be.true;
-      expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-      const eventObj = document.createEventObject ?
-          document.createEventObject() : document.createEvent('Events');
-      if (eventObj.initEvent) {
-        eventObj.initEvent('click', true, true);
-      }
-      sandbox.stub(sidebarElement, 'getAmpDoc', () => {
-        return {
-          win: {
-            location: {
-              // Mocking navigating from
-              // /context.html?old=context -> /context.html
-              href: 'http://localhost:9876/context.html?old=context',
-            },
+    it('should not close sidebar if clicked on new page navigation', () => {
+      return getAmpSidebar().then(obj => {
+        const sidebarElement = obj.ampSidebar;
+        const anchor = sidebarElement.getElementsByTagName('a')[0];
+        anchor.href = '#newloc';
+        const impl = sidebarElement.implementation_;
+        impl.schedulePause = sandbox.spy();
+        impl.vsync_ = {
+          mutate: function(callback) {
+            callback();
           },
         };
+        sandbox.stub(timer, 'delay', function(callback) {
+          callback();
+        });
+        expect(sidebarElement.hasAttribute('open')).to.be.false;
+        impl.open_();
+        expect(sidebarElement.hasAttribute('open')).to.be.true;
+        expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
+        const eventObj = document.createEventObject ?
+            document.createEventObject() : document.createEvent('Events');
+        if (eventObj.initEvent) {
+          eventObj.initEvent('click', true, true);
+        }
+        sandbox.stub(sidebarElement, 'getAmpDoc', () => {
+          return {
+            win: {
+              location: {
+                // Mocking navigating from
+                // /context.html?old=context -> /context.html
+                href: 'http://localhost:9876/context.html?old=context',
+              },
+            },
+          };
+        });
+        anchor.dispatchEvent ?
+            anchor.dispatchEvent(eventObj) :
+            anchor.fireEvent('onkeydown', eventObj);
+        expect(sidebarElement.hasAttribute('open')).to.be.true;
+        expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
+        expect(sidebarElement.style.display).to.equal('');
+        expect(impl.schedulePause).to.have.not.been.called;
       });
-      anchor.dispatchEvent ?
-          anchor.dispatchEvent(eventObj) :
-          anchor.fireEvent('onkeydown', eventObj);
-      expect(sidebarElement.hasAttribute('open')).to.be.true;
-      expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-      expect(sidebarElement.style.display).to.equal('');
-      expect(impl.schedulePause).to.have.not.been.called;
     });
-  });
 
-  it('should not close sidebar if clicked on non-anchor', () => {
-    return getAmpSidebar().then(obj => {
-      const sidebarElement = obj.ampSidebar;
-      const li = sidebarElement.getElementsByTagName('li')[0];
-      const impl = sidebarElement.implementation_;
-      impl.schedulePause = sandbox.spy();
-      impl.vsync_ = {
-        mutate: function(callback) {
+    it('should not close sidebar if clicked on non-anchor', () => {
+      return getAmpSidebar().then(obj => {
+        const sidebarElement = obj.ampSidebar;
+        const li = sidebarElement.getElementsByTagName('li')[0];
+        const impl = sidebarElement.implementation_;
+        impl.schedulePause = sandbox.spy();
+        impl.vsync_ = {
+          mutate: function(callback) {
+            callback();
+          },
+        };
+        sandbox.stub(timer, 'delay', function(callback) {
           callback();
-        },
-      };
-      sandbox.stub(timer, 'delay', function(callback) {
-        callback();
+        });
+        expect(sidebarElement.hasAttribute('open')).to.be.false;
+        impl.open_();
+        expect(sidebarElement.hasAttribute('open')).to.be.true;
+        expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
+        const eventObj = document.createEventObject ?
+            document.createEventObject() : document.createEvent('Events');
+        if (eventObj.initEvent) {
+          eventObj.initEvent('click', true, true);
+        }
+        li.dispatchEvent ?
+            li.dispatchEvent(eventObj) :
+            li.fireEvent('onkeydown', eventObj);
+        expect(sidebarElement.hasAttribute('open')).to.be.true;
+        expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
+        expect(sidebarElement.style.display).to.equal('');
+        expect(impl.schedulePause).to.have.not.been.called;
       });
-      expect(sidebarElement.hasAttribute('open')).to.be.false;
-      impl.open_();
-      expect(sidebarElement.hasAttribute('open')).to.be.true;
-      expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-      const eventObj = document.createEventObject ?
-          document.createEventObject() : document.createEvent('Events');
-      if (eventObj.initEvent) {
-        eventObj.initEvent('click', true, true);
-      }
-      li.dispatchEvent ?
-          li.dispatchEvent(eventObj) :
-          li.fireEvent('onkeydown', eventObj);
-      expect(sidebarElement.hasAttribute('open')).to.be.true;
-      expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-      expect(sidebarElement.style.display).to.equal('');
-      expect(impl.schedulePause).to.have.not.been.called;
     });
   });
 });

From 394c020d62dae241c21452e1e3a967bd722e4300 Mon Sep 17 00:00:00 2001
From: Aaron Turner <aaron@aaronthedev.com>
Date: Thu, 8 Jun 2017 11:57:31 -0700
Subject: [PATCH 11/11] Fixed the gulpfile typo

---
 gulpfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gulpfile.js b/gulpfile.js
index 9f6b25e37da2..9f7850642651 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -171,7 +171,7 @@ function declareExtension(name, version, hasCssOrOptions, opt_noTypeCheck,
  * This function is used for declaring deprecated extensions. It simply places the current
  * version code in place of the latest versions.
  * This has the ability to break an extension verison, so please be sure that this is
- * the correct to use.
+ * the correct one to use.
  * @param {string} name
  * @param {string} version E.g. 0.1
  * @param {string} lastestVersion