fix: fixes broken tests (#840)

Fixes HTML test generation to support `goog.module()` and take into account newlines
and spaces.

Updates python print statements to work in Python3+.

Author: bojeil-google

buildtools/gen_all_tests_js.py

@@ -25,13 +25,13 @@
 
 def main():
   common.cd_to_firebaseui_root()
-  print "var allTests = ["
+  print("var allTests = [")
   _print_test_files_under_root(common.TESTS_BASE_PATH)
-  print "];"
+  print("];")
   # The following is required in the context of protractor.
-  print "if (typeof module !== 'undefined' && module.exports) {"
-  print "  module.exports = allTests;"
-  print "}"
+  print("if (typeof module !== 'undefined' && module.exports) {")
+  print("  module.exports = allTests;")
+  print("}")
 
 
 def _print_test_files_under_root(root):
@@ -41,7 +41,7 @@ def _print_test_files_under_root(root):
     root: The path to the directory.
   """
   for file_name in common.get_files_with_suffix(root, "_test.html"):
-    print "  '%s'," % file_name[2:]  # Ignore the beginning './'.
+    print("  '%s'," % file_name[2:])  # Ignore the beginning './'.
 
 
 if __name__ == "__main__":

buildtools/gen_test_html.py

@@ -63,8 +63,9 @@ def _gen_html(js_path, template):
 
     _write_file(related_paths.html, generated_html)
 
-  except:  # pylint: disable=bare-except
-    print "HTML generation failed for: %s" % js_path
+  except Exception as e:  # pylint: disable=bare-except
+    print("HTML generation failed for: %s" % js_path)
+    print(e)
 
 
 def _get_related_paths_from_js_path(js_path):
@@ -86,21 +87,22 @@ def _get_related_paths_from_js_path(js_path):
 
 
 def _extract_closure_package(js_data):
-  """Extracts the package name that is goog.provide()d in the JS file.
+  """Extracts the package name that is goog.provide() or goog.module()
+  in the JS file.
 
   Args:
     js_data: The contents of a JS test (*_test.js) file.
 
   Returns:
-    The closure package goog.provide()d by the file.
+    The closure package goog.provide() or good.module() by the file.
 
   Raises:
-    ValueError: The JS does not contain a goog.provide().
+    ValueError: The JS does not contain a goog.provide() or goog.module().
   """
-  matches = re.search(r"goog\.provide\('(.+)'\);", js_data)
+  matches = re.search(r"goog\.(provide|module)\([\n\s]*'(.+)'\);", js_data)
   if matches is None:
-    raise ValueError("goog.provide() not found in file")
-  return matches.group(1)
+    raise ValueError("goog.provide() or goog.module() not found in file")
+  return matches.group(2)
 
 
 def _read_file(path):

javascript/ui/page/selecttenant_test.js

@@ -19,7 +19,8 @@
 goog.module('firebaseui.auth.ui.page.SelectTenantTest');
 goog.setTestOnly();
 
-
+const InfoBarTestHelper =
+    goog.require('firebaseui.auth.ui.element.InfoBarTestHelper');
 const KeyCodes = goog.require('goog.events.KeyCodes');
 const MockClock = goog.require('goog.testing.MockClock');
 const PageTestHelper = goog.require('firebaseui.auth.ui.page.PageTestHelper');
@@ -34,6 +35,8 @@ const testSuite = goog.require('goog.testing.testSuite');
 let mockClock;
 let root;
 let component;
+const infoBarTestHelper =
+    new InfoBarTestHelper().registerTests();
 const tosPpTestHelper = new TosPpTestHelper().registerTests();
 const pageTestHelper = new PageTestHelper().registerTests();
 
@@ -75,6 +78,7 @@ testSuite({
             TosPpTestHelper.prototype.onPpLinkClick,
             tosPpTestHelper));
     component.render(root);
+    infoBarTestHelper.setComponent(component);
     tosPpTestHelper.setComponent(component);
     // Reset previous state of tosPp helper.
     tosPpTestHelper.resetState();