Docserver: Display API features that are available to content scripts

chrome/common/extensions/docs/server2/api_data_source_test.py

Index: chrome/common/extensions/docs/server2/api_data_source_test.py
diff --git a/chrome/common/extensions/docs/server2/api_data_source_test.py b/chrome/common/extensions/docs/server2/api_data_source_test.py
index 1dfc6eb7d2622b8120c148f877d763b901bbd8f3..f26d1a1fd0df430e2226bcc106eaa71f2fbac43f 100755
--- a/chrome/common/extensions/docs/server2/api_data_source_test.py
+++ b/chrome/common/extensions/docs/server2/api_data_source_test.py
@@ -11,6 +11,7 @@ import unittest
 from api_data_source import (_JSCModel,
                              _FormatValue,
                              _GetEventByNameFromEvents)
+from api_models import ContentScriptAPI
 from api_schema_graph import APISchemaGraph
 from availability_finder import AvailabilityFinder, AvailabilityInfo
 from branch_utility import BranchUtility, ChannelInfo
@@ -134,7 +135,8 @@ class APIDataSourceTest(unittest.TestCase):
 
   def testCreateId(self):
     fake_avail_finder = _FakeAvailabilityFinder(self._fake_availability)
-    dict_ = _JSCModel(self._api_models.GetModel('tester').Get(),
+    dict_ = _JSCModel(self._api_models,
+                      self._api_models.GetModel('tester').Get(),
                       fake_avail_finder,
                       self._json_cache,
                       _FakeTemplateCache(),
@@ -150,7 +152,8 @@ class APIDataSourceTest(unittest.TestCase):
   def DISABLED_testToDict(self):
     fake_avail_finder = _FakeAvailabilityFinder(self._fake_availability)
     expected_json = self._LoadJSON('expected_tester.json')
-    dict_ = _JSCModel(self._api_models.GetModel('tester').Get(),
+    dict_ = _JSCModel(self._api_models,
+                      self._api_models.GetModel('tester').Get(),
                       fake_avail_finder,
                       self._json_cache,
                       _FakeTemplateCache(),
@@ -160,7 +163,8 @@ class APIDataSourceTest(unittest.TestCase):
 
   def testAddRules(self):
     fake_avail_finder = _FakeAvailabilityFinder(self._fake_availability)
-    dict_ = _JSCModel(self._api_models.GetModel('add_rules_tester').Get(),
+    dict_ = _JSCModel(self._api_models,
+                      self._api_models.GetModel('add_rules_tester').Get(),
                       fake_avail_finder,
                       #self._fake_availability,
                       self._json_cache,
@@ -185,12 +189,14 @@ class APIDataSourceTest(unittest.TestCase):
 
   def testGetIntroList(self):
     fake_avail_finder = _FakeAvailabilityFinder(self._fake_availability)
-    model = _JSCModel(self._api_models.GetModel('tester').Get(),
+    model = _JSCModel(self._api_models,
+                      self._api_models.GetModel('tester').Get(),
                       fake_avail_finder,
                       self._json_cache,
                       _FakeTemplateCache(),
                       self._features_bundle,
                       None)
+    expected_content_script_support = ContentScriptAPI('tester')
     expected_list = [
       { 'title': 'Description',
         'content': [
@@ -221,6 +227,15 @@ class APIDataSourceTest(unittest.TestCase):
           }
         ]
       },
+      { 'title': 'Content Scripts',
+        'content': [
+          {
+            'partial': 'handlebar chrome/common/extensions/docs' +
+                       '/templates/private/intro_tables/content_scripts.html',
+            'contentScriptSupport': expected_content_script_support.__dict__

[not at google - send to devlin, 2014/07/15 21:34:39]

I'd rather you test the dict output directly rather than relying on whatever
ContentScriptAPI.__dict__ spits out. i.e. what you had before?

+          }
+        ]
+      },
       { 'title': 'Learn More',
         'content': [
           { 'link': 'https://tester.test.com/welcome.html',
@@ -234,12 +249,13 @@ class APIDataSourceTest(unittest.TestCase):
     # Tests the same data with a scheduled availability.
     fake_avail_finder = _FakeAvailabilityFinder(
         AvailabilityInfo(ChannelInfo('beta', '1453', 27), scheduled=28))
-    model = _JSCModel(self._api_models.GetModel('tester').Get(),
-        fake_avail_finder,
-        self._json_cache,
-        _FakeTemplateCache(),
-        self._features_bundle,
-        None)
+    model = _JSCModel(self._api_models,
+                      self._api_models.GetModel('tester').Get(),
+                      fake_avail_finder,
+                      self._json_cache,
+                      _FakeTemplateCache(),
+                      self._features_bundle,
+                      None)
     expected_list[1] = {
       'title': 'Availability',
       'content': [
@@ -277,6 +293,7 @@ class APIDataSourceWithoutNodeAvailabilityTest(unittest.TestCase):
     }
     for api_name, availability in api_availabilities.iteritems():
       model_dict = _JSCModel(
+          self._api_models,
           self._api_models.GetModel(api_name).Get(),
           self._avail_finder,
           self._json_cache,
@@ -344,6 +361,7 @@ class APIDataSourceWithNodeAvailabilityTest(unittest.TestCase):
       self.assertEquals(node_availabilities[node], actual)
 
     model_dict = _JSCModel(
+        self._api_models,
         self._api_models.GetModel('tabs').Get(),
         self._avail_finder,
         self._json_cache,