Merge lp:~deryck/launchpad/rockstar-js-refresh into lp:launchpad

[Deryck Hodge]

[r=deryck][ui=none][bug=514190,672576] Update lazr-js to 1.5DEV-r188.

This is my attempt to get rockstar's javascript-refresh branch ready to land. It basically amounts to a bunch of sed's for yui to yui3 and a couple test fixes that were fragile. Since rockstar's branch (see pre-req branch) has already been approved, I'm going to land this unreviewed.

I've done a lot of manual testing, besides several ec2 runs, and I will create a bug to track QA on this change, since we will need to manually check out qastaging pretty heavily before approving this to deploy.

[Deryck Hodge (deryck)]

review: Approve

=== modified file 'buildout-templates/bin/test.in'
--- buildout-templates/bin/test.in	2010-10-15 04:53:38 +0000
+++ buildout-templates/bin/test.in	2010-12-01 21:32:51 +0000
@@ -169,7 +169,7 @@
     'tests_pattern': '^f?tests$',
     'test_path': [${buildout:directory/lib|path-repr}],
     'package': ['canonical', 'lp', 'devscripts', 'launchpad_loggerhead'],
-    'layer': ['!(MailmanLayer)'],
+    'layer': ['!(MailmanLayer|WindmillLayer)'],
     }
 
 # Monkey-patch os.listdir to randomise the results

=== modified file 'lib/canonical/launchpad/doc/lazr-js-widgets.txt'
--- lib/canonical/launchpad/doc/lazr-js-widgets.txt	2010-10-18 22:24:59 +0000
+++ lib/canonical/launchpad/doc/lazr-js-widgets.txt	2010-12-01 21:32:51 +0000
@@ -25,7 +25,7 @@
 content.
 
     >>> print widget()
-    <h1 id="..."><span class="yui-editable_text-text">My bug is &gt;
+    <h1 id="..."><span class="yui3-editable_text-text">My bug is &gt;
         important</span>
     </h1>
 
@@ -35,10 +35,10 @@
 
     >>> login('[e-mail]')
     >>> print widget()
-    <h1 id="..."><span class="yui-editable_text-text">My bug is &gt;
+    <h1 id="..."><span class="yui3-editable_text-text">My bug is &gt;
         important</span>
         <a href="http://bugs.launchpad.dev/.../+edit"
-           class="yui-editable_text-trigger sprite edit"
+           class="yui3-editable_text-trigger sprite edit"
         ></a>
     </h1>
     <script>
@@ -53,7 +53,7 @@
     ...     id="bug-title", title="Edit this summary")
     >>> print widget()
     <h1 id="bug-title">...
-        ...class="yui-editable_text-trigger sprite edit"...
+        ...class="yui3-editable_text-trigger sprite edit"...
 
 The initial_value_override parameter is passed as a JSON-serialized value.
 
@@ -107,7 +107,7 @@
     False
     >>> print widget()
     <span id="inline-picker-activator-id-...">...
-    <div class="yui-activator-message-box yui-activator-hidden" />
+    <div class="yui3-activator-message-box yui3-activator-hidden" />
     </span>
 
 The foo.bar user can see the activator's edit button.
@@ -118,7 +118,7 @@
     True
     >>> print widget()
     <span id="inline-picker-activator-id-...">
-    ...<div class="yui-activator-message-box yui-activator-hidden" />
+    ...<div class="yui3-activator-message-box yui3-activator-hidden" />
     </span>
     ...Y.lp.app.picker.addPickerPatcher(...
 

=== modified file 'lib/canonical/launchpad/doc/location-widget.txt'
--- lib/canonical/launchpad/doc/location-widget.txt	2010-10-18 22:24:59 +0000
+++ lib/canonical/launchpad/doc/location-widget.txt	2010-12-01 21:32:51 +0000
@@ -173,7 +173,7 @@
     >>> print widget.map_javascript
     <BLANKLINE>
     <script type="text/javascript">
-        YUI().use('node', 'lp.app.mapping', function(Y) {
+        LPS.use('node', 'lp.app.mapping', function(Y) {
             function renderMap() {
                 Y.lp.app.mapping.renderPersonMap(
                     52.2, 0.3, "Colin Watson",

=== modified file 'lib/canonical/launchpad/javascript/client/client.js'
--- lib/canonical/launchpad/javascript/client/client.js	2010-11-22 21:26:11 +0000
+++ lib/canonical/launchpad/javascript/client/client.js	2010-12-01 21:32:51 +0000
@@ -5,7 +5,12 @@
 LP.client.links = (typeof LP.links !== "undefined") ? LP.client.links : {};
 LP.client.cache = (typeof LP.objects !== "undefined") ? LP.client.cache : {};
 
-YUI().use("attribute", "io-base", "json-parse", "json-stringify", function(Y) {
+YUI({
+    bootstrap: false,
+    fetchCSS: false,
+    combine: false,
+    timeout: 50
+}).use("attribute", "io-base", "json-parse", "json-stringify", function(Y) {
 
 LP.client.HTTP_CREATED = 201;
 LP.client.HTTP_SEE_ALSO = 303;
@@ -525,7 +530,7 @@
 };
 });
 
-YUI().add('lp.client.plugins', function (Y) {
+YUI.add('lp.client.plugins', function (Y) {
 
 /**
  * A collection of plugins to hook LP.client into widgets.

=== modified file 'lib/canonical/launchpad/windmill/jstests/initialize.js'
--- lib/canonical/launchpad/windmill/jstests/initialize.js	2009-06-30 21:06:27 +0000
+++ lib/canonical/launchpad/windmill/jstests/initialize.js	2010-12-01 21:32:51 +0000
@@ -42,7 +42,12 @@
 
 
 /* The YUI instance used by SynchronizedTest. */
-SynchronizedTest.prototype.Y = YUI().use('dump');
+SynchronizedTest.prototype.Y = YUI({
+    bootstrap: false,
+    fetchCSS: false,
+    combine: false,
+    timeout: 50
+    }).use('dump');
 
 /* Create the synchronization node, that should make the wait() caller
  * return.

=== modified file 'lib/canonical/launchpad/windmill/testing/widgets.py'
--- lib/canonical/launchpad/windmill/testing/widgets.py	2010-11-07 18:37:37 +0000
+++ lib/canonical/launchpad/windmill/testing/widgets.py	2010-12-01 21:32:51 +0000
@@ -33,7 +33,7 @@
         """Constructor.
 
         :param client: A WindmillTestClient instance for interacting with pages.
-        :param widget_name: The class name of the YUI widget, like 'yui-picker'.
+        :param widget_name: The class name of the YUI widget, like 'yui3-picker'.
         """
         self.client = client
         self.widget_name = widget_name
@@ -76,22 +76,22 @@
 
 
 class SearchPickerWidget(OnPageWidget):
-    """A proxy for the yui-picker widget from lazr-js."""
+    """A proxy for the yui3-picker widget from lazr-js."""
 
     def __init__(self, client):
         """Constructor.
 
         :param client: A WindmillTestClient instance.
         """
-        super(SearchPickerWidget, self).__init__(client, 'yui-picker')
+        super(SearchPickerWidget, self).__init__(client, 'yui3-picker')
         self.search_input_xpath = (
-            self.xpath + "//input[@class='yui-picker-search']")
+            self.xpath + "//input[@class='yui3-picker-search']")
         self.search_button_xpath = (
-            self.xpath + "//div[@class='yui-picker-search-box']/button")
+            self.xpath + "//div[@class='yui3-picker-search-box']/button")
 
     def _get_result_xpath_by_number(self, item_number):
         """Return the XPath for the given search result number."""
-        item_xpath = "//ul[@class='yui-picker-results']/li[%d]/span" % item_number
+        item_xpath = "//ul[@class='yui3-picker-results']/li[%d]/span" % item_number
         return self.xpath + item_xpath
 
     def do_search(self, text):
@@ -234,7 +234,7 @@
         # Click on edit button.
         button_xpath = (
             u"//span[@id='%s']"
-             "/button[not(contains(@class, 'yui-activator-hidden'))]"
+             "/button[not(contains(@class, 'yui3-activator-hidden'))]"
              % self.activator_id)
         client.waits.forElement(
             xpath=button_xpath,
@@ -303,15 +303,15 @@
         # Click on edit button.
         button_xpath = (
             u"//span[@id='%s']"
-             "/button[not(contains(@class, 'yui-activator-hidden'))]"
+             "/button[not(contains(@class, 'yui3-activator-hidden'))]"
              % self.activator_id)
         client.waits.forElement(xpath=button_xpath, timeout=u'25000')
         client.click(xpath=button_xpath)
 
         # Click on remove button.
         remove_button_xpath = (
-            u"//div[contains(@class, 'yui-picker ') "
-             "and not(contains(@class, 'yui-picker-hidden'))]"
+            u"//div[contains(@class, 'yui3-picker ') "
+             "and not(contains(@class, 'yui3-picker-hidden'))]"
              "//*[contains(@class, '%s')]" % self.button_class)
         client.waits.forElement(xpath=remove_button_xpath, timeout=u'25000')
         client.click(xpath=remove_button_xpath)
@@ -319,7 +319,7 @@
 
         # Verify removal.
         client.asserts.assertText(
-            xpath=u"//span[@id='%s']/span[@class='yui-activator-data-box']"
+            xpath=u"//span[@id='%s']/span[@class='yui3-activator-data-box']"
                   % self.activator_id,
             validator=self.new_value)
 
@@ -329,11 +329,11 @@
 
         # Verify removal, again.
         client.waits.forElement(
-            xpath=u"//span[@id='%s']/span[@class='yui-activator-data-box']"
+            xpath=u"//span[@id='%s']/span[@class='yui3-activator-data-box']"
                   % self.activator_id,
             timeout=u'25000')
         client.asserts.assertText(
-            xpath=u"//span[@id='%s']/span[@class='yui-activator-data-box']"
+            xpath=u"//span[@id='%s']/span[@class='yui3-activator-data-box']"
                   % self.activator_id,
             validator=self.new_value)
 

=== modified file 'lib/canonical/widgets/lazrjs.py'
--- lib/canonical/widgets/lazrjs.py	2010-09-24 18:10:31 +0000
+++ lib/canonical/widgets/lazrjs.py	2010-12-01 21:32:51 +0000
@@ -47,7 +47,7 @@
     #   value: the current field value
     WIDGET_TEMPLATE = dedent(u"""\
         <%(tag)s id="%(id)s"><span
-            class="yui-editable_text-text">%(value)s</span>
+            class="yui3-editable_text-text">%(value)s</span>
             %(trigger)s
         </%(tag)s>
         %(activation_script)s
@@ -55,7 +55,7 @@
 
     # Template for the trigger button.
     TRIGGER_TEMPLATE = dedent(u"""\
-        <a href="%(edit_url)s" class="yui-editable_text-trigger sprite edit"
+        <a href="%(edit_url)s" class="yui3-editable_text-trigger sprite edit"
         ></a>
         """)
 
@@ -185,7 +185,7 @@
             %(edit_controls)s
             <h2>%(title)s</h2>
           </div>
-          <div class="yui-editable_text-text">%(value)s</div>
+          <div class="yui3-editable_text-text">%(value)s</div>
         </div>
         %(activation_script)s
         """)

=== modified file 'lib/canonical/widgets/location.py'
--- lib/canonical/widgets/location.py	2010-09-27 16:49:22 +0000
+++ lib/canonical/widgets/location.py	2010-12-01 21:32:51 +0000
@@ -130,7 +130,7 @@
             show_marker=self.show_marker)
         return """
             <script type="text/javascript">
-                YUI().use('node', 'lp.app.mapping', function(Y) {
+                LPS.use('node', 'lp.app.mapping', function(Y) {
                     function renderMap() {
                         Y.lp.app.mapping.renderPersonMap(
                             %(center_lat)s, %(center_lng)s, %(displayname)s,

=== modified file 'lib/canonical/widgets/templates/inline-picker.pt'
--- lib/canonical/widgets/templates/inline-picker.pt	2010-07-15 10:59:22 +0000
+++ lib/canonical/widgets/templates/inline-picker.pt	2010-12-01 21:32:51 +0000
@@ -1,15 +1,15 @@
 <span tal:attributes="id view/id">
-    <span class="yui-activator-data-box">
+    <span class="yui3-activator-data-box">
     <tal:attribute replace="structure view/default_html"/>
     </span>
-    <button class="lazr-btn yui-activator-act yui-activator-hidden">
+    <button class="lazr-btn yui3-activator-act yui3-activator-hidden">
       Edit
     </button>
-    <div class="yui-activator-message-box yui-activator-hidden"/>
+    <div class="yui3-activator-message-box yui3-activator-hidden"/>
 </span>
 <script tal:condition="view/can_write"
         tal:content="structure string:
-YUI().use('lp.app.picker', function(Y) {
+LPS.use('lp.app.picker', function(Y) {
     if (Y.UA.ie) {
         return;
     }

=== modified file 'lib/canonical/widgets/templates/license.pt'
--- lib/canonical/widgets/templates/license.pt	2010-09-25 21:42:09 +0000
+++ lib/canonical/widgets/templates/license.pt	2010-12-01 21:32:51 +0000
@@ -21,7 +21,7 @@
 </script>
 <script type="text/javascript">
 //<![CDATA[
-YUI().use('node', 'lazr.effects', function(Y) {
+LPS.use('node', 'lazr.effects', function(Y) {
     Y.on('domready', function() {
         function make_slider(cfg) {
             var table_name = '#' + cfg.which;

=== modified file 'lib/canonical/widgets/templates/vocabulary-picker.js.template'
--- lib/canonical/widgets/templates/vocabulary-picker.js.template	2010-07-15 10:59:22 +0000
+++ lib/canonical/widgets/templates/vocabulary-picker.js.template	2010-12-01 21:32:51 +0000
@@ -1,4 +1,4 @@
-YUI().use('node', 'lp.app.picker', 'plugin', function(Y) {
+LPS.use('node', 'lp.app.picker', 'plugin', function(Y) {
     if (Y.UA.ie) {
         return;
     }

=== modified file 'lib/lp/app/browser/tests/base-layout.txt'
--- lib/lp/app/browser/tests/base-layout.txt	2010-10-26 01:26:00 +0000
+++ lib/lp/app/browser/tests/base-layout.txt	2010-12-01 21:32:51 +0000
@@ -219,7 +219,7 @@
     >>> view = LocationlessView(team, request)
     >>> body = find_tag_by_id(view.render(), 'document')
     >>> print body['class']
-    tab-overview locationless private yui-skin-sam
+    tab-overview locationless private yui3-skin-sam
 
 When the context is public, the 'public' class is in the class attribute.
 
@@ -228,7 +228,7 @@
     >>> view = LocationlessView(team, request)
     >>> body = find_tag_by_id(view.render(), 'document')
     >>> print body['class']
-    tab-overview locationless public yui-skin-sam
+    tab-overview locationless public yui3-skin-sam
 
 
 Notifications

=== modified file 'lib/lp/app/browser/tests/test_base_layout.py'
--- lib/lp/app/browser/tests/test_base_layout.py	2010-09-29 03:26:01 +0000
+++ lib/lp/app/browser/tests/test_base_layout.py	2010-12-01 21:32:51 +0000
@@ -106,7 +106,7 @@
         self.verify_base_layout_head_parts(view, content)
         document = find_tag_by_id(content, 'document')
         self.verify_base_layout_body_parts(document)
-        classes = 'tab-overview main_side public yui-skin-sam'.split()
+        classes = 'tab-overview main_side public yui3-skin-sam'.split()
         self.assertEqual(classes, document['class'].split())
         self.verify_watermark(document)
         self.assertEqual(
@@ -121,7 +121,7 @@
         self.verify_base_layout_head_parts(view, content)
         document = find_tag_by_id(content, 'document')
         self.verify_base_layout_body_parts(document)
-        classes = 'tab-overview main_only public yui-skin-sam'.split()
+        classes = 'tab-overview main_only public yui3-skin-sam'.split()
         self.assertEqual(classes, document['class'].split())
         self.verify_watermark(document)
         self.assertEqual(
@@ -138,7 +138,7 @@
         document = find_tag_by_id(content, 'document')
         self.verify_base_layout_body_parts(document)
         self.verify_watermark(document)
-        classes = 'tab-overview searchless public yui-skin-sam'.split()
+        classes = 'tab-overview searchless public yui3-skin-sam'.split()
         self.assertEqual(classes, document['class'].split())
         self.assertEqual(
             'registering', document.find(True, id='registration')['class'])
@@ -153,7 +153,7 @@
         self.verify_base_layout_head_parts(view, content)
         document = find_tag_by_id(content, 'document')
         self.verify_base_layout_body_parts(document)
-        classes = 'tab-overview locationless public yui-skin-sam'.split()
+        classes = 'tab-overview locationless public yui3-skin-sam'.split()
         self.assertEqual(classes, document['class'].split())
         self.assertEqual(None, document.find(True, id='registration'))
         self.assertEqual(None, document.find(True, id='watermark'))

=== added file 'lib/lp/app/configure.zcml'
--- lib/lp/app/configure.zcml	1970-01-01 00:00:00 +0000
+++ lib/lp/app/configure.zcml	2010-09-29 12:39:28 +0000
@@ -0,0 +1,14 @@
+<!-- Copyright 2009 Canonical Ltd.  This software is licensed under the
+     GNU Affero General Public License version 3 (see the file LICENSE).
+-->
+
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:browser="http://namespaces.zope.org/browser"
+    xmlns:i18n="http://namespaces.zope.org/i18n"
+    xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc"
+    xmlns:lp="http://namespaces.canonical.com/lp"
+    i18n_domain="launchpad">
+    <include
+        package=".browser"/>
+</configure>

=== modified file 'lib/lp/app/javascript/lp-mochi.js'
--- lib/lp/app/javascript/lp-mochi.js	2010-01-21 21:03:05 +0000
+++ lib/lp/app/javascript/lp-mochi.js	2010-12-01 21:32:51 +0000
@@ -359,7 +359,7 @@
 }
 
 function connectRemoteCommentReply(comment_index) {
-    YUI().use('event', function(Y) {
+    LPS.use('event', function(Y) {
         var toggleFunc = function() {
             toggleRemoteCommentReply(comment_index);
             return false;

=== modified file 'lib/lp/app/javascript/lp.js'
--- lib/lp/app/javascript/lp.js	2010-10-27 15:18:56 +0000
+++ lib/lp/app/javascript/lp.js	2010-12-01 21:32:51 +0000
@@ -244,7 +244,7 @@
     // registers a function to fire onload.
     // Use this for initilaizing any javascript that should fire once the page
     // has been loaded.
-    YUI().use('node', function(Y) {
+    LPS.use('node', function(Y) {
         Y.on('load', function(e) {
             func();
         }, window);
@@ -311,7 +311,7 @@
                     node.focus();
                 }
             } catch (e) {
-                YUI().use('console', function(Y) {
+                LPS.use('console', function(Y) {
                     Y.log('In setFocusByName(<' +
                         node.tagName + ' type=' + node.type + '>): ' + e);
                 });

=== modified file 'lib/lp/app/javascript/picker.js'
--- lib/lp/app/javascript/picker.js	2010-07-15 10:59:22 +0000
+++ lib/lp/app/javascript/picker.js	2010-12-01 21:32:51 +0000
@@ -56,7 +56,7 @@
     };
 
     var show_hide_buttons = function () {
-        var link = content_box.one('.yui-activator-data-box a');
+        var link = content_box.one('.yui3-activator-data-box a');
         if (remove_button) {
             if (link === null || !show_remove_button) {
                 remove_button.addClass('yui-picker-hidden');
@@ -223,8 +223,8 @@
 
     var new_config = Y.merge(config, {
         align: {
-            points: [Y.WidgetPositionExt.CC,
-                     Y.WidgetPositionExt.CC]
+            points: [Y.WidgetPositionAlign.CC,
+                     Y.WidgetPositionAlign.CC]
         },
         progressbar: true,
         progress: 100,

=== modified file 'lib/lp/app/javascript/tests/test_lp_collapsibles.html'
--- lib/lp/app/javascript/tests/test_lp_collapsibles.html	2010-11-15 20:42:40 +0000
+++ lib/lp/app/javascript/tests/test_lp_collapsibles.html	2010-12-01 21:32:51 +0000
@@ -17,7 +17,7 @@
   <!-- The test suite -->
   <script type="text/javascript" src="test_lp_collapsibles.js"></script>
 </head>
-<body class="yui-skin-sam">
+<body class="yui3-skin-sam">
   <div id="container-of-stuff">
   </div>
 </body>

=== modified file 'lib/lp/app/javascript/tests/test_lp_collapsibles.js'
--- lib/lp/app/javascript/tests/test_lp_collapsibles.js	2010-11-15 20:42:40 +0000
+++ lib/lp/app/javascript/tests/test_lp_collapsibles.js	2010-12-01 21:32:51 +0000
@@ -3,7 +3,8 @@
 YUI({
     base: '../../../../canonical/launchpad/icing/yui/',
     filter: 'raw',
-    combine: false
+    combine: false,
+    fetchCSS: false
     }).use('test', 'console', 'lp', function(Y) {
 
 var Assert = Y.Assert;  // For easy access to isTrue(), etc.

=== modified file 'lib/lp/app/templates/base-layout-macros.pt'
--- lib/lp/app/templates/base-layout-macros.pt	2010-12-01 21:32:45 +0000
+++ lib/lp/app/templates/base-layout-macros.pt	2010-12-01 21:32:51 +0000
@@ -656,7 +656,16 @@
       tal:content="string:var cookie_scope = '${request/lp:cookie_scope}';"></script>
   <script type="text/javascript">
     // Define a global YUI sandbox that should be used by everyone.
-    var LPS = YUI();
+    var LPS = YUI({
+      // Don't try to fetch the loader module.
+      bootstrap: false,
+      // Don't try to fetch CSS files.
+      fetchCSS: false,
+      // Turn off combo loading.
+      combine: false,
+      // For paranoia, set a low timeout to not wait on loading a resource.
+      timeout: 50
+      });
   </script>
 </metal:load-javascript>
 

=== modified file 'lib/lp/app/templates/base-layout.pt'
--- lib/lp/app/templates/base-layout.pt	2010-11-26 21:28:00 +0000
+++ lib/lp/app/templates/base-layout.pt	2010-12-01 21:32:51 +0000
@@ -69,7 +69,7 @@
     tal:attributes="class string:tab-${view/menu:selectedfacetname}
       ${view/macro:pagetype}
       ${view/context/fmt:public-private-css}
-      yui-skin-sam">
+      yui3-skin-sam">
         <script type="text/javascript"
           tal:condition="python: is_lpnet">
           var _gaq = _gaq || [];

=== modified file 'lib/lp/app/templates/launchpad-widget-macros.pt'
--- lib/lp/app/templates/launchpad-widget-macros.pt	2010-10-15 01:27:04 +0000
+++ lib/lp/app/templates/launchpad-widget-macros.pt	2010-12-01 21:32:51 +0000
@@ -116,7 +116,7 @@
     </tal:yui2resources>
 
     <script type="text/javascript">
-        YUI().use('node', 'lp.app.calendar', function(Y) {
+        LPS.use('node', 'lp.app.calendar', function(Y) {
             Y.lp.app.calendar.setup_calendar_widgets();
         });
     </script>

=== modified file 'lib/lp/bugs/browser/bugalsoaffects.py'
--- lib/lp/bugs/browser/bugalsoaffects.py	2010-11-23 23:22:27 +0000
+++ lib/lp/bugs/browser/bugalsoaffects.py	2010-12-01 21:32:51 +0000
@@ -195,7 +195,7 @@
             structured("""
                 There is no project in Launchpad named "%s". Please
                 <a href="/projects"
-                onclick="YUI().use('event').Event.simulate(
+                onclick="LPS.use('event').Event.simulate(
                          document.getElementById('%s'), 'click');
                          return false;"
                 >search for it</a> as it may be

=== modified file 'lib/lp/bugs/javascript/bugtask_index.js'
--- lib/lp/bugs/javascript/bugtask_index.js	2010-08-02 17:49:45 +0000
+++ lib/lp/bugs/javascript/bugtask_index.js	2010-12-01 21:32:51 +0000
@@ -1338,8 +1338,8 @@
                     bugtarget_content.replaceChild(
                         Y.DOM.create(
                             '<a href="+editstatus" ' +
-                            '   class="sprite edit yui-activator-act" />'),
-                        bugtarget_content.one('.yui-activator-act'));
+                            '   class="sprite edit yui3-activator-act" />'),
+                        bugtarget_content.one('.yui3-activator-act'));
                 } else {
                     var bugtarget_picker = Y.lp.app.picker.addPickerPatcher(
                         'Product',

=== modified file 'lib/lp/bugs/javascript/official_bug_tags.js'
--- lib/lp/bugs/javascript/official_bug_tags.js	2010-11-03 15:49:43 +0000
+++ lib/lp/bugs/javascript/official_bug_tags.js	2010-12-01 21:32:51 +0000
@@ -355,7 +355,7 @@
                      '<img src="/@@/error" />&nbsp;Invalid Tag</span>',
       bodyContent: Y.Lang.substitute(ERROR_MSG, {new_tag: new_tag}),
       align: {
-        points: [Y.WidgetPositionExt.CC, Y.WidgetPositionExt.CC]
+        points: [Y.WidgetPositionAlign.CC, Y.WidgetPositionAlign.CC]
       },
       progressbar: false,
       progress: 0

=== modified file 'lib/lp/bugs/javascript/tests/test_bug_subscription_widget.html'
--- lib/lp/bugs/javascript/tests/test_bug_subscription_widget.html	2010-08-20 13:22:03 +0000
+++ lib/lp/bugs/javascript/tests/test_bug_subscription_widget.html	2010-12-01 21:32:51 +0000
@@ -35,7 +35,7 @@
     .unseen { display: none; }
   </style>
 </head>
-<body class="yui-skin-sam">
+<body class="yui3-skin-sam">
   <div id="log"></div>
 </body>
 </html>

=== modified file 'lib/lp/bugs/javascript/tests/test_bug_subscription_widget.js'
--- lib/lp/bugs/javascript/tests/test_bug_subscription_widget.js	2010-08-20 14:17:56 +0000
+++ lib/lp/bugs/javascript/tests/test_bug_subscription_widget.js	2010-12-01 21:32:51 +0000
@@ -3,7 +3,8 @@
 YUI({
     base: '../../../../canonical/launchpad/icing/yui/',
     filter: 'raw',
-    combine: false
+    combine: false,
+    fetchCSS: false
     }).use(
         'event', 'lp.bugs.bug_subscription_widget', 'node', 'test',
         'widget-stack', 'console', function(Y) {

=== modified file 'lib/lp/bugs/javascript/tests/test_me_too.html'
--- lib/lp/bugs/javascript/tests/test_me_too.html	2010-07-11 00:32:53 +0000
+++ lib/lp/bugs/javascript/tests/test_me_too.html	2010-12-01 21:32:51 +0000
@@ -35,7 +35,7 @@
     .unseen { display: none; }
   </style>
 </head>
-<body class="yui-skin-sam">
+<body class="yui3-skin-sam">
   <div id="log"></div>
 </body>
 </html>

=== modified file 'lib/lp/bugs/javascript/tests/test_me_too.js'
--- lib/lp/bugs/javascript/tests/test_me_too.js	2010-10-24 21:00:11 +0000
+++ lib/lp/bugs/javascript/tests/test_me_too.js	2010-12-01 21:32:51 +0000
@@ -3,7 +3,8 @@
 YUI({
     base: '../../../../canonical/launchpad/icing/yui/',
     filter: 'raw',
-    combine: false
+    combine: false,
+    fetchCSS: false
     }).use('event', 'lp.bugs.bugtask_index', 'node', 'test', 'widget-stack', 'console',
         function(Y) {
 
@@ -20,19 +21,6 @@
     Y.Event.simulate(rawnode, evtype, options);
 }
 
-/* Helper function to clean up a dynamically added widget instance. */
-function cleanup_widget(widget) {
-    // Nuke the boundingBox, but only if we've touched the DOM.
-    if (widget.get('rendered')) {
-        var bb = widget.get('boundingBox');
-        if (bb.get('parentNode')) {
-            bb.get('parentNode').removeChild(bb);
-        }
-    }
-    // Kill the widget itself.
-    widget.destroy();
-}
-
 var suite = new Y.Test.Suite("Bugtask Me-Too Choice Edit Tests");
 
 suite.add(new Y.Test.Case({
@@ -79,9 +67,6 @@
     },
 
     tearDown: function() {
-        if (this.choice_edit._choice_list) {
-            cleanup_widget(this.choice_edit._choice_list);
-        }
         var status = Y.one("document").one("#affectsmetoo");
         if (status) {
             status.get("parentNode").removeChild(status);

=== modified file 'lib/lp/bugs/javascript/tests/test_subscriber.html'
--- lib/lp/bugs/javascript/tests/test_subscriber.html	2010-07-11 00:32:53 +0000
+++ lib/lp/bugs/javascript/tests/test_subscriber.html	2010-12-01 21:32:51 +0000
@@ -29,7 +29,7 @@
       div#sample {margin:15px; width:200px; border:1px solid #999; padding:10px;}
     </style>
   </head>
-  <body class="yui-skin-sam">
+  <body class="yui3-skin-sam">
     <!-- Example markup required by test suite -->
   <div id="sample">
     <div class="section">

=== modified file 'lib/lp/bugs/javascript/tests/test_subscriber.js'
--- lib/lp/bugs/javascript/tests/test_subscriber.js	2010-07-11 00:32:53 +0000
+++ lib/lp/bugs/javascript/tests/test_subscriber.js	2010-12-01 21:32:51 +0000
@@ -1,6 +1,6 @@
 YUI({
     base: '../../../../canonical/launchpad/icing/yui/',
-    filter: 'raw', combine: false
+    filter: 'raw', combine: false, fetchCSS: false
     }).use('test', 'console', 'lp.bugs.subscriber', function(Y) {
 
 var suite = new Y.Test.Suite("lp.bugs.subscriber Tests");

=== modified file 'lib/lp/bugs/templates/bugtarget-patches.pt'
--- lib/lp/bugs/templates/bugtarget-patches.pt	2010-08-03 18:13:34 +0000
+++ lib/lp/bugs/templates/bugtarget-patches.pt	2010-12-01 21:32:51 +0000
@@ -20,7 +20,7 @@
         tal:attributes="action string:${context/fmt:url}/+patches">
 
     <script type="text/javascript">
-      YUI().use('base', 'node', 'event', function(Y) {
+      LPS.use('base', 'node', 'event', function(Y) {
         Y.on('domready', function(e) {
           Y.get('#sort-button').setStyle('display', 'none');
           Y.get('#orderby').on('change', function(e) {
@@ -87,7 +87,7 @@
                  <p tal:content="string:${patch/title}"></p>
                </div>
                <script type="text/javascript" tal:content="string:
-                 YUI().use('base', 'node', 'event', function(Y) {
+                 LPS.use('base', 'node', 'event', function(Y) {
                    Y.on('domready', function(e) {
                      var cell_id = '#patch-cell-${repeat/patch_task/index}';
                      var target_id = '#patch-popup-${repeat/patch_task/index}';

=== modified file 'lib/lp/bugs/templates/bugtask-tasks-and-nominations-table-row.pt'
--- lib/lp/bugs/templates/bugtask-tasks-and-nominations-table-row.pt	2010-06-15 13:51:55 +0000
+++ lib/lp/bugs/templates/bugtask-tasks-and-nominations-table-row.pt	2010-12-01 21:32:51 +0000
@@ -38,7 +38,7 @@
     </td>
     <td tal:condition="not:indent_task">
       <span tal:attributes="id string:bugtarget-picker-${row_id}">
-        <span class="yui-activator-data-box">
+        <span class="yui3-activator-data-box">
           <span title="This project&rsquo;s license has not been specified.">
             <a tal:attributes="href context/target/fmt:url;
                                title view/target_link_title;
@@ -46,10 +46,10 @@
                tal:content="context/bugtargetdisplayname" />
           </span>
         </span>
-        <button class="lazr-btn yui-activator-act yui-activator-hidden">
+        <button class="lazr-btn yui3-activator-act yui3-activator-hidden">
           Edit
         </button>
-        <div class="yui-activator-message-box yui-activator-hidden" />
+        <div class="yui3-activator-message-box yui3-activator-hidden" />
       </span>
     </td>
 
@@ -131,7 +131,7 @@
 
       <tal:has_no_watch condition="not: context/bugwatch">
         <span tal:attributes="id string:assignee-picker-${row_id}">
-          <span class="yui-activator-data-box">
+          <span class="yui3-activator-data-box">
             <a tal:condition="context/assignee"
                tal:attributes="href context/assignee/fmt:url;
                                class context/assignee/image:sprite_css"
@@ -140,10 +140,10 @@
               Unassigned
             </tal:unassigned>
           </span>
-          <button class="lazr-btn yui-activator-act yui-activator-hidden">
+          <button class="lazr-btn yui3-activator-act yui3-activator-hidden">
             Edit
           </button>
-          <div class="yui-activator-message-box yui-activator-hidden" />
+          <div class="yui3-activator-message-box yui3-activator-hidden" />
         </span>
       </tal:has_no_watch>
     </td>

=== renamed file 'lib/lp/bugs/windmill/tests/test_bug_also_affects_new_upstream.py.disabled' => 'lib/lp/bugs/windmill/tests/test_bug_also_affects_new_upstream.py'
=== renamed file 'lib/lp/bugs/windmill/tests/test_bug_inline_subscriber.py.disabled' => 'lib/lp/bugs/windmill/tests/test_bug_inline_subscriber.py'
--- lib/lp/bugs/windmill/tests/test_bug_inline_subscriber.py.disabled	2010-12-01 21:32:45 +0000
+++ lib/lp/bugs/windmill/tests/test_bug_inline_subscriber.py	2010-12-01 21:32:51 +0000
@@ -193,6 +193,7 @@
             id=u'subscribers-links', timeout=FOR_ELEMENT)
         # Confirm there are 2 subscriber links: one in duplicate subscribers,
         # and one in indirect subscribers.
+        client.waits.sleep(milliseconds=SLEEP)
         client.asserts.assertNode(
             xpath=(u'//div[@id="subscribers-from-duplicates"]'
                    '/div/a[@name="Sample Person"]'))
@@ -228,7 +229,7 @@
         # Now back to bug 5. Confirm there are 2 subscriptions.
         client.open(url=bug_url % 5)
         client.waits.forPageLoad(timeout=PAGE_LOAD)
-        client.asserts.assertNode(
+        client.waits.forElement(
             id='direct-subscriber-12', timeout=FOR_ELEMENT)
         # The first click unsubscribes the direct subscription, leaving
         # the duplicate subscription.

=== renamed file 'lib/lp/bugs/windmill/tests/test_bug_me_too.py.disabled' => 'lib/lp/bugs/windmill/tests/test_bug_me_too.py'
=== renamed file 'lib/lp/bugs/windmill/tests/test_bug_tags_entry.py.disabled' => 'lib/lp/bugs/windmill/tests/test_bug_tags_entry.py'
=== modified file 'lib/lp/bugs/windmill/tests/test_mark_duplicate.py'
--- lib/lp/bugs/windmill/tests/test_mark_duplicate.py	2010-12-01 21:32:45 +0000
+++ lib/lp/bugs/windmill/tests/test_mark_duplicate.py	2010-12-01 21:32:51 +0000
@@ -78,7 +78,8 @@
         client.click(xpath=CHANGE_BUTTON)
         client.waits.forElement(
             xpath=u"//span[@id='mark-duplicate-text']/"
-                  u"a[contains(., 'Mark as duplicate')]")
+                  u"a[contains(., 'Mark as duplicate')]",
+            timeout=constants.FOR_ELEMENT)
 
         # The warning about commenting on a diplucate bug is now gone.
         client.asserts.assertNotNode(id='warning-comment-on-duplicate')
@@ -87,15 +88,19 @@
         client.click(id=u'mark-duplicate-text')
         client.type(text=u'123', id=u'field.duplicateof')
         client.click(xpath=CHANGE_BUTTON)
+        client.waits.sleep(milliseconds=constants.SLEEP)
         error_xpath = (
             MAIN_FORM_ELEMENT +
             "//div[contains(@class, 'yui3-lazr-formoverlay-errors')]/ul/li")
-        client.waits.forElement(xpath=error_xpath)
+        client.waits.forElement(
+            xpath=error_xpath, timeout=constants.FOR_ELEMENT)
 
         # Clicking change again brings back the error dialog again
         # (regression test for bug 347258)
         client.click(xpath=CHANGE_BUTTON)
-        client.waits.forElement(xpath=error_xpath)
+        client.waits.sleep(milliseconds=constants.SLEEP)
+        client.waits.forElement(
+            xpath=error_xpath, timeout=constants.FOR_ELEMENT)
 
         # But entering a correct bug and submitting
         # gets us back to a normal state
@@ -103,19 +108,26 @@
         client.click(xpath=CHANGE_BUTTON)
         client.waits.forElement(
             xpath=u"//span[@id='mark-duplicate-text']"
-                  u"/a[contains(., 'bug #1')]")
+                  u"/a[contains(., 'bug #1')]",
+            timeout=constants.FOR_ELEMENT)
 
         # Finally, clicking on the link to the bug takes you to the master.
         client.click(link=u'bug #1')
         client.waits.forPageLoad(timeout=constants.PAGE_LOAD)
-        client.asserts.assertText(
-            xpath=u"//h1[@id='bug-title']/span[1]",
-            validator=u'Firefox does not support SVG')
+        client.waits.forElement(
+            id=u'bug-title', timeout=constants.FOR_ELEMENT)
+
+        # Make sure all js loads are complete before trying the next test.
+        client.waits.forElement(
+            xpath="//a[contains(@class, 'js-action') and "
+            "contains(@class, 'menu-link-mark-dupe')]",
+            timeout=constants.FOR_ELEMENT)
 
         # If someone wants to set the master to dupe another bug, there
         # is a warning in the dupe widget about this bug having its own
         # duplicates.
         client.click(classname='menu-link-mark-dupe')
+        client.waits.sleep(milliseconds=constants.SLEEP)
         client.asserts.assertTextIn(
             classname='large-warning', validator=u'This bug has duplicates',
             timeout=constants.FOR_ELEMENT)

=== modified file 'lib/lp/bugs/windmill/tests/test_official_bug_tags_management.py'
--- lib/lp/bugs/windmill/tests/test_official_bug_tags_management.py	2010-12-01 21:32:45 +0000
+++ lib/lp/bugs/windmill/tests/test_official_bug_tags_management.py	2010-12-01 21:32:51 +0000
@@ -43,7 +43,8 @@
 
         client.asserts.assertElemJS(
             id=u'official-tags-list',
-            js=u'element.childNodes.length == 0')
+            js=u'element.childNodes.length == 0',
+            timeout=constants.FOR_ELEMENT)
 
     # The save button is disabled initially, since there's nothing to change.
 
@@ -194,13 +195,16 @@
         client.waits.forPageLoad(timeout=constants.PAGE_LOAD)
         client.asserts.assertNode(
             xpath=u'//ul[@id="official-tags-list"]/li[@id="tag-%s"]' %
-            a_new_tag)
-        client.asserts.assertNode(
-            xpath=u'//ul[@id="official-tags-list"]/li[@id="tag-%s"]' %
-                  another_new_tag)
-        client.asserts.assertNode(
-            xpath=u'//ul[@id="official-tags-list"]/li[@id="tag-%s"]' %
-                  doc_tag)
+            a_new_tag,
+            timeout=constants.FOR_ELEMENT)
+        client.asserts.assertNode(
+            xpath=u'//ul[@id="official-tags-list"]/li[@id="tag-%s"]' %
+                  another_new_tag,
+            timeout=constants.FOR_ELEMENT)
+        client.asserts.assertNode(
+            xpath=u'//ul[@id="official-tags-list"]/li[@id="tag-%s"]' %
+                  doc_tag,
+            timeout=constants.FOR_ELEMENT)
 
     # We finish by cleaning after ourselves, to make sure that we leave the
     # database at the same state we found it.

=== added file 'lib/lp/code/interfaces/branchmergequeue.py'
--- lib/lp/code/interfaces/branchmergequeue.py	1970-01-01 00:00:00 +0000
+++ lib/lp/code/interfaces/branchmergequeue.py	2010-11-03 08:28:44 +0000
@@ -0,0 +1,129 @@
+# Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Branch merge queue interfaces."""
+
+__metaclass__ = type
+
+__all__ = [
+    'IBranchMergeQueue',
+    'IBranchMergeQueueSource',
+    'user_has_special_merge_queue_access',
+    ]
+
+from lazr.restful.declarations import (
+    export_as_webservice_entry,
+    export_write_operation,
+    exported,
+    mutator_for,
+    operation_parameters,
+    )
+from lazr.restful.fields import (
+    CollectionField,
+    Reference,
+    )
+from zope.component import getUtility
+from zope.interface import Interface
+from zope.schema import (
+    Datetime,
+    Int,
+    Text,
+    TextLine,
+    )
+
+from canonical.launchpad import _
+from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
+from lp.services.fields import (
+    PersonChoice,
+    PublicPersonChoice,
+    )
+
+
+class IBranchMergeQueue(Interface):
+    """An interface for managing branch merges."""
+
+    export_as_webservice_entry()
+
+    id = Int(title=_('ID'), readonly=True, required=True)
+
+    registrant = exported(
+        PublicPersonChoice(
+            title=_("The user that registered the branch."),
+            required=True, readonly=True,
+            vocabulary='ValidPersonOrTeam'))
+
+    owner = exported(
+        PersonChoice(
+            title=_('Owner'),
+            required=True, readonly=True,
+            vocabulary='UserTeamsParticipationPlusSelf',
+            description=_("The owner of the merge queue.")))
+
+    name = exported(
+        TextLine(
+            title=_('Name'), required=True,
+            description=_(
+                "Keep very short, unique, and descriptive, because it will "
+                "be used in URLs.  "
+                "Examples: main, devel, release-1.0, gnome-vfs.")))
+
+    description = exported(
+        Text(
+            title=_('Description'), required=False,
+            description=_(
+                'A short description of the purpose of this merge queue.')))
+
+    configuration = exported(
+        TextLine(
+            title=_('Configuration'), required=False, readonly=True,
+            description=_(
+                "A JSON string of configuration values.")))
+
+    date_created = exported(
+        Datetime(
+            title=_('Date Created'),
+            required=True,
+            readonly=True))
+
+    branches = exported(
+        CollectionField(
+            title=_('Dependent Branches'),
+            description=_(
+                'A collection of branches that this queue manages.'),
+            readonly=True,
+            value_type=Reference(Interface)))
+
+    @mutator_for(configuration)
+    @operation_parameters(
+        config=TextLine(title=_("A JSON string of configuration values.")))
+    @export_write_operation()
+    def setMergeQueueConfig(config):
+        """Set the JSON string configuration of the merge queue.
+
+        :param config: A JSON string of configuration values.
+        """
+
+
+class IBranchMergeQueueSource(Interface):
+
+    def new(name, owner, registrant, description, configuration, branches):
+        """Create a new IBranchMergeQueue object.
+
+        :param name: The name of the branch merge queue.
+        :param description: A description of queue.
+        :param configuration: A JSON string of configuration values.
+        :param owner: The owner of the queue.
+        :param registrant: The registrant of the queue.
+        :param branches: A list of branches to add to the queue.
+        """
+
+
+def user_has_special_merge_queue_access(user):
+    """Admins and bazaar experts have special access.
+
+    :param user: A 'Person' or None.
+    """
+    if user is None:
+        return False
+    celebs = getUtility(ILaunchpadCelebrities)
+    return user.inTeam(celebs.admin) or user.inTeam(celebs.bazaar_experts)

=== modified file 'lib/lp/code/javascript/branchmergeproposal.diff.js'
--- lib/lp/code/javascript/branchmergeproposal.diff.js	2010-12-01 21:32:45 +0000
+++ lib/lp/code/javascript/branchmergeproposal.diff.js	2010-12-01 21:32:51 +0000
@@ -73,8 +73,8 @@
                 var diff_overlay = new DiffOverlay({
                         bodyContent: Y.Node.create(formatted_diff),
                         align: {
-                            points: [Y.WidgetPositionExt.CC,
-                                     Y.WidgetPositionExt.CC]
+                            points: [Y.WidgetPositionAlign.CC,
+                                     Y.WidgetPositionAlign.CC]
                         },
                         progressbar: false
                     });

=== modified file 'lib/lp/code/javascript/tests/test_productseries-setbranch.html'
--- lib/lp/code/javascript/tests/test_productseries-setbranch.html	2010-04-29 15:21:05 +0000
+++ lib/lp/code/javascript/tests/test_productseries-setbranch.html	2010-12-01 21:32:51 +0000
@@ -16,7 +16,7 @@
   <!-- The module under test -->
   <script type="text/javascript" src="../productseries-setbranch.js"></script>
   <script type="text/javascript">
-    YUI().use('lp.code.productseries_setbranch', function(Y) {
+    LPS.use('lp.code.productseries_setbranch', function(Y) {
       Y.on('domready', Y.lp.code.productseries_setbranch.setup);
     });
   </script>
@@ -25,7 +25,7 @@
   <script type="text/javascript" src="test_productseries_setbranch.js"></script>
   </head>
 
-<body class="yui-skin-sam">
+<body class="yui3-skin-sam">
   <div id="productseries-setbranch">
   <form action="." name="launchpadform" method="post"
         enctype="multipart/form-data"

=== modified file 'lib/lp/code/javascript/tests/test_productseries_setbranch.js'
--- lib/lp/code/javascript/tests/test_productseries_setbranch.js	2010-04-07 13:05:43 +0000
+++ lib/lp/code/javascript/tests/test_productseries_setbranch.js	2010-12-01 21:32:51 +0000
@@ -7,7 +7,7 @@
 
 YUI({
     base: '../../../../canonical/launchpad/icing/yui/',
-    filter: 'raw', combine: false
+    filter: 'raw', combine: false, fetchCSS: false
     }).use('node-event-simulate', 'test', 'console', 'Event', 'CustomEvent',
            'lp.code.productseries_setbranch', function(Y) {
 

=== added file 'lib/lp/code/model/branchmergequeue.py'
--- lib/lp/code/model/branchmergequeue.py	1970-01-01 00:00:00 +0000
+++ lib/lp/code/model/branchmergequeue.py	2010-11-01 12:35:07 +0000
@@ -0,0 +1,88 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Implementation classes for IBranchMergeQueue, etc."""
+
+__metaclass__ = type
+__all__ = ['BranchMergeQueue']
+
+import simplejson
+from storm.locals import (
+    Int,
+    Reference,
+    Store,
+    Storm,
+    Unicode,
+    )
+from zope.interface import (
+    classProvides,
+    implements,
+    )
+
+from canonical.database.datetimecol import UtcDateTimeCol
+from canonical.launchpad.interfaces.lpstorm import IMasterStore
+from lp.code.errors import InvalidMergeQueueConfig
+from lp.code.interfaces.branchmergequeue import (
+    IBranchMergeQueue,
+    IBranchMergeQueueSource,
+    )
+from lp.code.model.branch import Branch
+
+
+class BranchMergeQueue(Storm):
+    """See `IBranchMergeQueue`."""
+
+    __storm_table__ = 'BranchMergeQueue'
+    implements(IBranchMergeQueue)
+    classProvides(IBranchMergeQueueSource)
+
+    id = Int(primary=True)
+
+    registrant_id = Int(name='registrant', allow_none=True)
+    registrant = Reference(registrant_id, 'Person.id')
+
+    owner_id = Int(name='owner', allow_none=True)
+    owner = Reference(owner_id, 'Person.id')
+
+    name = Unicode(allow_none=False)
+    description = Unicode(allow_none=False)
+    configuration = Unicode(allow_none=False)
+
+    date_created = UtcDateTimeCol(notNull=True)
+
+    @property
+    def branches(self):
+        """See `IBranchMergeQueue`."""
+        return Store.of(self).find(
+            Branch,
+            Branch.merge_queue_id == self.id)
+
+    def setMergeQueueConfig(self, config):
+        """See `IBranchMergeQueue`."""
+        try:
+            simplejson.loads(config)
+            self.configuration = config
+        except ValueError: # The config string is not valid JSON
+            raise InvalidMergeQueueConfig
+
+    @classmethod
+    def new(cls, name, owner, registrant, description=None,
+            configuration=None, branches=None):
+        """See `IBranchMergeQueueSource`."""
+        store = IMasterStore(BranchMergeQueue)
+
+        if configuration is None:
+            configuration = unicode(simplejson.dumps({}))
+
+        queue = cls()
+        queue.name = name
+        queue.owner = owner
+        queue.registrant = registrant
+        queue.description = description
+        queue.configuration = configuration
+        if branches is not None:
+            for branch in branches:
+                branch.addToQueue(queue)
+
+        store.add(queue)
+        return queue

=== added file 'lib/lp/code/model/tests/test_branchmergequeue.py'
--- lib/lp/code/model/tests/test_branchmergequeue.py	1970-01-01 00:00:00 +0000
+++ lib/lp/code/model/tests/test_branchmergequeue.py	2010-10-25 14:51:56 +0000
@@ -0,0 +1,155 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Unit tests for methods of BranchMergeQueue."""
+
+from __future__ import with_statement
+
+import simplejson
+
+from canonical.launchpad.interfaces.lpstorm import IStore
+from canonical.launchpad.webapp.testing import verifyObject
+from canonical.testing.layers import (
+    AppServerLayer,
+    DatabaseFunctionalLayer,
+    )
+from lp.code.errors import InvalidMergeQueueConfig
+from lp.code.interfaces.branchmergequeue import IBranchMergeQueue
+from lp.code.model.branchmergequeue import BranchMergeQueue
+from lp.testing import (
+    ANONYMOUS,
+    person_logged_in,
+    launchpadlib_for,
+    TestCaseWithFactory,
+    ws_object,
+    )
+
+
+class TestBranchMergeQueueInterface(TestCaseWithFactory):
+    """Test IBranchMergeQueue interface."""
+
+    layer = DatabaseFunctionalLayer
+
+    def test_implements_interface(self):
+        queue = self.factory.makeBranchMergeQueue()
+        IStore(BranchMergeQueue).add(queue)
+        verifyObject(IBranchMergeQueue, queue)
+
+
+class TestBranchMergeQueueSource(TestCaseWithFactory):
+    """Test the methods of IBranchMergeQueueSource."""
+
+    layer = DatabaseFunctionalLayer
+
+    def test_new(self):
+        owner = self.factory.makePerson()
+        name = u'SooperQueue'
+        description = u'This is Sooper Queue'
+        config = unicode(simplejson.dumps({'test': 'make check'}))
+
+        queue = BranchMergeQueue.new(
+            name, owner, owner, description, config)
+
+        self.assertEqual(queue.name, name)
+        self.assertEqual(queue.owner, owner)
+        self.assertEqual(queue.registrant, owner)
+        self.assertEqual(queue.description, description)
+        self.assertEqual(queue.configuration, config)
+
+
+class TestBranchMergeQueue(TestCaseWithFactory):
+    """Test the functions of the BranchMergeQueue."""
+
+    layer = DatabaseFunctionalLayer
+
+    def test_branches(self):
+        """Test that a merge queue can get all its managed branches."""
+        store = IStore(BranchMergeQueue)
+
+        queue = self.factory.makeBranchMergeQueue()
+        store.add(queue)
+
+        branch = self.factory.makeBranch()
+        store.add(branch)
+        with person_logged_in(branch.owner):
+            branch.addToQueue(queue)
+
+        self.assertEqual(
+            list(queue.branches),
+            [branch])
+
+    def test_setMergeQueueConfig(self):
+        """Test that the configuration is set properly."""
+        queue = self.factory.makeBranchMergeQueue()
+        config = unicode(simplejson.dumps({
+            'test': 'make test'}))
+
+        with person_logged_in(queue.owner):
+            queue.setMergeQueueConfig(config)
+
+        self.assertEqual(queue.configuration, config)
+
+    def test_setMergeQueueConfig_invalid_json(self):
+        """Test that invalid json can't be set as the config."""
+        queue = self.factory.makeBranchMergeQueue()
+
+        with person_logged_in(queue.owner):
+            self.assertRaises(
+                InvalidMergeQueueConfig,
+                queue.setMergeQueueConfig,
+                'abc')
+
+
+class TestWebservice(TestCaseWithFactory):
+
+    layer = AppServerLayer
+
+    def test_properties(self):
+        """Test that the correct properties are exposed."""
+        with person_logged_in(ANONYMOUS):
+            name = u'teh-queue'
+            description = u'Oh hai! I are a queues'
+            configuration = unicode(simplejson.dumps({'test': 'make check'}))
+
+            queuer = self.factory.makePerson()
+            db_queue = self.factory.makeBranchMergeQueue(
+                registrant=queuer, owner=queuer, name=name,
+                description=description,
+                configuration=configuration)
+            branch1 = self.factory.makeBranch()
+            with person_logged_in(branch1.owner):
+                branch1.addToQueue(db_queue)
+            branch2 = self.factory.makeBranch()
+            with person_logged_in(branch2.owner):
+                branch2.addToQueue(db_queue)
+            launchpad = launchpadlib_for('test', db_queue.owner,
+                service_root="http://api.launchpad.dev:8085")
+
+        queuer = ws_object(launchpad, queuer)
+        queue = ws_object(launchpad, db_queue)
+        branch1 = ws_object(launchpad, branch1)
+        branch2 = ws_object(launchpad, branch2)
+
+        self.assertEqual(queue.registrant, queuer)
+        self.assertEqual(queue.owner, queuer)
+        self.assertEqual(queue.name, name)
+        self.assertEqual(queue.description, description)
+        self.assertEqual(queue.configuration, configuration)
+        self.assertEqual(queue.date_created, db_queue.date_created)
+        self.assertEqual(len(queue.branches), 2)
+
+    def test_set_configuration(self):
+        """Test the mutator for setting configuration."""
+        with person_logged_in(ANONYMOUS):
+            db_queue = self.factory.makeBranchMergeQueue()
+            launchpad = launchpadlib_for('test', db_queue.owner,
+                service_root="http://api.launchpad.dev:8085")
+
+        configuration = simplejson.dumps({'test': 'make check'})
+
+        queue = ws_object(launchpad, db_queue)
+        queue.configuration = configuration
+        queue.lp_save()
+
+        queue2 = ws_object(launchpad, db_queue)
+        self.assertEqual(queue2.configuration, configuration)

=== modified file 'lib/lp/code/windmill/tests/test_branch_popupdiff.py'
--- lib/lp/code/windmill/tests/test_branch_popupdiff.py	2010-12-01 21:32:45 +0000
+++ lib/lp/code/windmill/tests/test_branch_popupdiff.py	2010-12-01 21:32:51 +0000
@@ -134,6 +134,7 @@
         client.waits.sleep(milliseconds=JS_ONLOAD_EXECUTE_DELAY)
 
         client.click(xpath=ADD_BRANCH_MENU)
+        client.waits.sleep(milliseconds=JS_ONLOAD_EXECUTE_DELAY)
         client.waits.forElement(xpath=BRANCH_SEARCH_FIELD)
         client.type(text='~fred/fooix/proposed', xpath=BRANCH_SEARCH_FIELD)
         client.click(xpath=BRANCH_SEARCH_BUTTON)

=== modified file 'lib/lp/code/windmill/tests/test_branchmergeproposal_review.py'
--- lib/lp/code/windmill/tests/test_branchmergeproposal_review.py	2010-11-04 19:59:02 +0000
+++ lib/lp/code/windmill/tests/test_branchmergeproposal_review.py	2010-12-01 21:32:51 +0000
@@ -17,6 +17,7 @@
     search_and_select_picker_widget,
     )
 from lp.code.windmill.testing import CodeWindmillLayer
+from canonical.launchpad.windmill.testing import constants
 from lp.testing import (
     login_person,
     WindmillTestCase,
@@ -49,6 +50,7 @@
         client.waits.forPageLoad(timeout=u'10000')
 
         link = u'//a[@class="menu-link-register_merge sprite add"]'
+        client.waits.forElement(xpath=link, timeout=constants.FOR_ELEMENT)
         client.click(xpath=link)
         client.type(text=u'~name12/gnome-terminal/main',
             id=u'field.target_branch.target_branch')

=== modified file 'lib/lp/registry/browser/__init__.py'
--- lib/lp/registry/browser/__init__.py	2010-09-28 05:20:22 +0000
+++ lib/lp/registry/browser/__init__.py	2010-12-01 21:32:51 +0000
@@ -112,7 +112,7 @@
             'milestone_row_uri': self.milestone_row_uri_template,
             }
         return """
-            YUI().use(
+            LPS.use(
                 'node', 'lp.registry.milestoneoverlay',
                 'lp.registry.milestonetable',
                 function (Y) {

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2010-11-24 10:10:07 +0000
+++ lib/lp/registry/browser/person.py	2010-12-01 21:32:51 +0000
@@ -3499,7 +3499,7 @@
                         'center_lng': self.context.longitude}
         return u"""
             <script type="text/javascript">
-                YUI().use('node', 'lp.app.mapping', function(Y) {
+                LPS.use('node', 'lp.app.mapping', function(Y) {
                     function renderMap() {
                         Y.lp.app.mapping.renderPersonMapSmall(
                             %(center_lat)s, %(center_lng)s);

=== modified file 'lib/lp/registry/browser/team.py'
--- lib/lp/registry/browser/team.py	2010-11-24 08:05:42 +0000
+++ lib/lp/registry/browser/team.py	2010-12-01 21:32:51 +0000
@@ -1140,7 +1140,7 @@
         """HTML which shows the map with location of the team's members."""
         return """
             <script type="text/javascript">
-                YUI().use('node', 'lp.app.mapping', function(Y) {
+                LPS.use('node', 'lp.app.mapping', function(Y) {
                     function renderMap() {
                         Y.lp.app.mapping.renderTeamMap(
                             %(min_lat)s, %(max_lat)s, %(min_lng)s,
@@ -1155,7 +1155,7 @@
         """The HTML which shows a small version of the team's map."""
         return """
             <script type="text/javascript">
-                YUI().use('node', 'lp.app.mapping', function(Y) {
+                LPS.use('node', 'lp.app.mapping', function(Y) {
                     function renderMap() {
                         Y.lp.app.mapping.renderTeamMapSmall(
                             %(center_lat)s, %(center_lng)s);

=== modified file 'lib/lp/registry/browser/tests/productseries-views.txt'
--- lib/lp/registry/browser/tests/productseries-views.txt	2010-09-13 12:09:30 +0000
+++ lib/lp/registry/browser/tests/productseries-views.txt	2010-12-01 21:32:51 +0000
@@ -82,7 +82,7 @@
     >>> script = find_tag_by_id(view.render(), 'milestone-script')
     >>> print script
     <script id="milestone-script" type="text/javascript">
-        YUI().use(... 'lp.registry.milestoneoverlay',
+        LPS.use(... 'lp.registry.milestoneoverlay',
                       'lp.registry.milestonetable'...
             var series_uri = '/app/simple';
             var milestone_form_uri = '.../app/simple/+addmilestone/++form++';

=== modified file 'lib/lp/registry/javascript/tests/test_milestone_table.html'
--- lib/lp/registry/javascript/tests/test_milestone_table.html	2010-11-15 20:42:40 +0000
+++ lib/lp/registry/javascript/tests/test_milestone_table.html	2010-12-01 21:32:51 +0000
@@ -18,7 +18,7 @@
   <script type="text/javascript" src="test_milestone_table.js"></script>
 
 </head>
-<body class="yui-skin-sam">
+<body class="yui3-skin-sam">
   <table id="series-trunk" class="listing">
     <thead>
       <tr>

=== modified file 'lib/lp/registry/javascript/tests/test_milestone_table.js'
--- lib/lp/registry/javascript/tests/test_milestone_table.js	2010-04-29 15:21:05 +0000
+++ lib/lp/registry/javascript/tests/test_milestone_table.js	2010-12-01 21:32:51 +0000
@@ -2,7 +2,7 @@
 
 YUI({
     base: '../../../../canonical/launchpad/icing/yui/',
-    filter: 'raw', combine: false
+    filter: 'raw', combine: false, fetchCSS: false
     }).use('test', 'console', 'lp.registry.milestonetable', function(Y) {
 
     var milestonetable = Y.lp.registry.milestonetable;

=== modified file 'lib/lp/registry/javascript/tests/timeline-iframe.html'
--- lib/lp/registry/javascript/tests/timeline-iframe.html	2010-04-28 18:43:25 +0000
+++ lib/lp/registry/javascript/tests/timeline-iframe.html	2010-12-01 21:32:51 +0000
@@ -41,7 +41,7 @@
   }
   </style>
 </head>
-<body class="yui-skin-sam">
+<body class="yui3-skin-sam">
   <div id="timeline_example">
   </div>
   <div id="log"></div>

=== modified file 'lib/lp/registry/javascript/tests/timeline.js'
--- lib/lp/registry/javascript/tests/timeline.js	2010-04-29 15:21:05 +0000
+++ lib/lp/registry/javascript/tests/timeline.js	2010-12-01 21:32:51 +0000
@@ -3,7 +3,8 @@
 YUI({
     base: '../../../../canonical/launchpad/icing/yui/',
     filter: 'raw',
-    combine: false
+    combine: false,
+    fetchCSS: false
     }).use('test', 'console', 'lp.registry.timeline', function(Y) {
 
 var Assert = Y.Assert;  // For easy access to isTrue(), etc.
@@ -109,12 +110,12 @@
     },
 
     test_zoom_buttons: function() {
-        var zoom_in = this.content_box.one('a.yui-timelinegraph-zoom-in');
+        var zoom_in = this.content_box.one('a.yui3-timelinegraph-zoom-in');
         Assert.isNotNull(
             zoom_in,
             'zoom_in link not found.');
 
-        var zoom_out = this.content_box.one('a.yui-timelinegraph-zoom-out');
+        var zoom_out = this.content_box.one('a.yui3-timelinegraph-zoom-out');
         Assert.isNotNull(
             zoom_in,
             'zoom_out link not found.');
@@ -188,7 +189,7 @@
             '(1st) The frame was not resized to match the canvas.');
 
         simulate(
-            this.timeline_graph, '.yui-timelinegraph-zoom-in', 'click');
+            this.timeline_graph, '.yui3-timelinegraph-zoom-in', 'click');
 
         // The canvas is recreated in order to
         // resize correctly in all browsers.
@@ -202,7 +203,7 @@
             'The canvas did not get scaled.');
 
         simulate(
-            this.timeline_graph, '.yui-timelinegraph-zoom-out', 'click');
+            this.timeline_graph, '.yui3-timelinegraph-zoom-out', 'click');
 
         canvas = this.content_box.one('canvas');
         Assert.areEqual(1, this.timeline_graph.graph_scale);

=== modified file 'lib/lp/registry/templates/distributionsourcepackage-index.pt'
--- lib/lp/registry/templates/distributionsourcepackage-index.pt	2010-11-17 00:21:51 +0000
+++ lib/lp/registry/templates/distributionsourcepackage-index.pt	2010-12-01 21:32:51 +0000
@@ -231,10 +231,7 @@
       </p>
     </div>
 <script type="text/javascript">
-YUI({
-        base: '../../lib/yui/current/build/',
-        filter: 'raw'
-    }).use('node', 'event', 'lazr.effects', function(Y) {
+    LPS.use('node', 'event', 'lazr.effects', function(Y) {
 
     // XXX Michael Nelson 20090702 bug=340497 This slider
     // needs an integration test.

=== modified file 'lib/lp/registry/templates/product-index.pt'
--- lib/lp/registry/templates/product-index.pt	2010-10-25 14:59:48 +0000
+++ lib/lp/registry/templates/product-index.pt	2010-12-01 21:32:51 +0000
@@ -34,7 +34,7 @@
 
         <script type="text/javascript"
                 tal:content="string:
-          YUI().use('lp.registry.pillar', function(Y) {
+          LPS.use('lp.registry.pillar', function(Y) {
               Y.on('load',
                   function(e) {
                       Y.lp.registry.pillar.activate_collapsible_div();

=== modified file 'lib/lp/registry/templates/productseries-setbranch.pt'
--- lib/lp/registry/templates/productseries-setbranch.pt	2010-04-01 18:17:05 +0000
+++ lib/lp/registry/templates/productseries-setbranch.pt	2010-12-01 21:32:51 +0000
@@ -119,7 +119,7 @@
   </div>
 
   <script type="text/javascript">
-    YUI().use('lp.code.productseries_setbranch', function(Y) {
+    LPS.use('lp.code.productseries_setbranch', function(Y) {
       Y.on('domready', Y.lp.code.productseries_setbranch.setup);
     });
   </script>

=== modified file 'lib/lp/registry/templates/team-portlet-membership.pt'
--- lib/lp/registry/templates/team-portlet-membership.pt	2010-04-29 15:21:05 +0000
+++ lib/lp/registry/templates/team-portlet-membership.pt	2010-12-01 21:32:51 +0000
@@ -105,7 +105,7 @@
           tal:condition="link/enabled">
         <script type="text/javascript"
                 tal:content="string:
-          YUI().use('lp.registry.team', function(Y) {
+          LPS.use('lp.registry.team', function(Y) {
               Y.on('load',
                   function(e) {
                       Y.lp.registry.team.setup_add_member_handler();

=== modified file 'lib/lp/soyuz/javascript/tests/archivesubscribers_index.js'
--- lib/lp/soyuz/javascript/tests/archivesubscribers_index.js	2010-08-10 09:54:13 +0000
+++ lib/lp/soyuz/javascript/tests/archivesubscribers_index.js	2010-12-01 21:32:51 +0000
@@ -4,7 +4,8 @@
 YUI({
     base: '../../../../canonical/launchpad/icing/yui/',
     filter: 'raw',
-    combine: false
+    combine: false,
+    fetchCSS: false
     }).use(
         'test', 'console', 'lp.soyuz.archivesubscribers_index', function(Y) {
 

=== modified file 'lib/lp/soyuz/javascript/tests/lp_dynamic_dom_updater.js'
--- lib/lp/soyuz/javascript/tests/lp_dynamic_dom_updater.js	2010-08-10 10:40:02 +0000
+++ lib/lp/soyuz/javascript/tests/lp_dynamic_dom_updater.js	2010-12-01 21:32:51 +0000
@@ -4,7 +4,8 @@
 YUI({
     base: '../../../../canonical/launchpad/icing/yui/',
     filter: 'raw',
-    combine: false
+    combine: false,
+    fetchCSS: false
     }).use('test', 'console', 'lp.soyuz.dynamic_dom_updater', function(Y) {
 
 var Assert = Y.Assert;  // For easy access to isTrue(), etc.

=== modified file 'lib/lp/soyuz/javascript/tests/test_archivesubscribers_index.html'
--- lib/lp/soyuz/javascript/tests/test_archivesubscribers_index.html	2010-08-10 09:32:38 +0000
+++ lib/lp/soyuz/javascript/tests/test_archivesubscribers_index.html	2010-12-01 21:32:51 +0000
@@ -16,7 +16,7 @@
   <!-- The test suite -->
   <script type="text/javascript" src="archivesubscribers_index.js"></script>
 </head>
-<body class="yui-skin-sam">
+<body class="yui3-skin-sam">
   <h1>Testing the ArchiveSubscribersIndex javascript</h1>
 
   <h2>Errors</h2>

=== modified file 'lib/lp/soyuz/javascript/tests/test_lp_dynamic_dom_updater.html'
--- lib/lp/soyuz/javascript/tests/test_lp_dynamic_dom_updater.html	2010-08-10 09:32:38 +0000
+++ lib/lp/soyuz/javascript/tests/test_lp_dynamic_dom_updater.html	2010-12-01 21:32:51 +0000
@@ -16,7 +16,7 @@
   <!-- The test suite -->
   <script type="text/javascript" src="lp_dynamic_dom_updater.js"></script>
 </head>
-<body class="yui-skin-sam">
+<body class="yui3-skin-sam">
   <div id="lp_dynamic_dom_updater_example">
   </div>
   <div id="log"></div>

=== modified file 'lib/lp/soyuz/templates/archive-index.pt'
--- lib/lp/soyuz/templates/archive-index.pt	2010-07-29 22:01:51 +0000
+++ lib/lp/soyuz/templates/archive-index.pt	2010-12-01 21:32:51 +0000
@@ -150,10 +150,7 @@
             >Celso Providelo</a>.</p>
 
         <script type="text/javascript">
-YUI({
-        base: '../../lib/yui/current/build/',
-        filter: 'raw'
-    }).use('node', 'event', 'lazr.effects', function(Y) {
+    LPS.use('node', 'event', 'lazr.effects', function(Y) {
 
     // Hide the widget body contents.
     Y.one('#ppa-install .widget-body').addClass('lazr-closed');

=== modified file 'lib/lp/testing/__init__.py'
--- lib/lp/testing/__init__.py	2010-12-01 12:00:00 +0000
+++ lib/lp/testing/__init__.py	2010-12-01 21:32:51 +0000
@@ -762,16 +762,17 @@
         client = self.client
         client.open(url=yui_runner_url)
         client.waits.forPageLoad(timeout=constants.PAGE_LOAD)
-        client.waits.forElement(id='complete')
+        # This is very fragile for some reason, so we need a long delay here.
+        client.waits.forElement(id='complete', timeout=constants.PAGE_LOAD)
         response = client.commands.getPageText()
         self._yui_results = {}
         # Maybe testing.pages should move to lp to avoid circular imports.
         from canonical.launchpad.testing.pages import find_tags_by_class
         entries = find_tags_by_class(
-            response['result'], 'yui-console-entry-TestRunner')
+            response['result'], 'yui3-console-entry-TestRunner')
         for entry in entries:
             category = entry.find(
-                attrs={'class': 'yui-console-entry-cat'})
+                attrs={'class': 'yui3-console-entry-cat'})
             if category is None:
                 continue
             result = category.string

=== modified file 'lib/lp/translations/templates/languageset-index.pt'
--- lib/lp/translations/templates/languageset-index.pt	2010-08-20 00:39:54 +0000
+++ lib/lp/translations/templates/languageset-index.pt	2010-12-01 21:32:51 +0000
@@ -14,7 +14,7 @@
         tal:attributes="src string:${icingroot}/build/worlddata/languages.js">
       </script>
       <script type="text/javascript">
-          YUI().use('languages', 'event', function(Y) {
+          LPS.use('languages', 'event', function(Y) {
               Y.on('domready', function(e) {
                   Y.languages.initialize_languages_page(Y);
               });

=== modified file 'utilities/yui-deps.py'
--- utilities/yui-deps.py	2009-07-17 00:26:05 +0000
+++ utilities/yui-deps.py	2010-12-01 21:32:51 +0000
@@ -47,7 +47,12 @@
         if not match:
             continue
         # We want to bundle the minimized version
-        module = os.path.join(yui_root, match.group(1)) + '-min.js'
+        # unless it's a lang module.
+        file_path = match.group(1)
+        if 'lang' in file_path:
+            module = os.path.join(yui_root, match.group(1)) + '.js'
+        else:
+            module = os.path.join(yui_root, match.group(1)) + '-min.js'
         if not os.path.isfile(module):
             sys.stderr.write(
                 "Found invalid YUI module: %s\n" % module)

=== modified file 'versions.cfg'
--- versions.cfg	2010-12-01 21:32:45 +0000
+++ versions.cfg	2010-12-01 21:32:51 +0000
@@ -36,7 +36,7 @@
 lazr.smtptest = 1.1
 lazr.testing = 0.1.1
 lazr.uri = 1.0.2
-lazr-js = 1.5DEV-r188
+lazr-js = 1.5DEV-r191
 manuel = 1.1.1
 martian = 0.11
 mechanize = 0.1.11