Reviewers: mp+169502_code.launchpad.net,

Message:
Please take a look.

Description:
Fix CI tests

I just added some small fixes to the good work primarily done by Jeff.

https://code.launchpad.net/~gary/juju-gui/fix-charm-panel-tests/+merge/169502

(do not edit description out of merge proposal)


Please review this at https://codereview.appspot.com/10253055/

Affected files:
   A [revision details]
   M app/subapps/browser/templates/browser_charm.handlebars
   M app/subapps/browser/templates/sidebar.handlebars
   M app/templates/charm-token.handlebars
   M test/test_charm_running.py


Index: [revision details]
=== added file '[revision details]'
--- [revision details]	2012-01-01 00:00:00 +0000
+++ [revision details]	2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: test/test_charm_running.py
=== modified file 'test/test_charm_running.py'
--- test/test_charm_running.py	2013-06-12 14:14:36 +0000
+++ test/test_charm_running.py	2013-06-14 17:13:29 +0000
@@ -111,27 +111,47 @@

      def deploy(self, charm_name):
          """Deploy a charm."""
-        def charm_panel_loaded(driver):
-            """Wait for the charm panel to be ready and displayed."""
-            charm_search =  
driver.find_element_by_id('charm-search-trigger')
-            # Click to open the charm panel.
-            # Implicit wait should let this resolve.
-            self.click(charm_search)
-            panel = driver.find_element_by_id('juju-search-charm-panel')
-            if panel.is_displayed():
-                return panel
-
-        charm_panel = self.wait_for(
-            charm_panel_loaded, error='Unable to load charm panel.')
+        # Warning!
+        # This depends on manage.jujucharms.com being up and working  
properly.
+        # For many reasons, hopefully this is not an issue :-) but if
+        # some inexplicable failure is going on here, try that possible
+        # source.
+        def get_search_box(driver):
+            # The charm browser sidebar should be open by default.
+            return driver.find_element_by_css_selector('[name=bws-search]')
+
+        def get_charm_token(driver):
+            # See  
http://www.w3.org/TR/css3-selectors/#attribute-substrings .
+            return driver.find_element_by_css_selector(
+                '.yui3-charmtoken-content '
+                '.charm-token[data-charmid*={}]'.format(charm_name))
+
+        def get_add_button(driver):
+            return  
driver.find_element_by_css_selector('.bws-view-data .add')
+
+        def get_deploy_button(driver):
+            return driver.find_element_by_id('charm-deploy')
+
+        # Search for the charm
+        search_box = self.wait_for(
+            get_search_box, error='Charm search box is not visible')
+        search_box.send_keys(charm_name)
+        search_box.send_keys('\n')
+
+        # Open details page
+        charm_token = self.wait_for(
+            get_charm_token, error='Charm sidebar is not visible.')
+        charm_token.click()
+
+        # Create Ghost
+        add_button = self.wait_for(
+            get_add_button, error='Charm details page is not visible.')
+        add_button.click()

          # Deploy a charm.
-        deploy_button = charm_panel.find_element_by_css_selector(
-            # See http://www.w3.org/TR/css3-selectors/#attribute-substrings
-            'button.deploy[data-url*={}]'.format(charm_name))
-        self.click(deploy_button)
-        # Click to confirm deployment.
-        confirm_button = charm_panel.find_element_by_id('charm-deploy')
-        self.click(confirm_button)
+        deploy_button = self.wait_for(
+            get_deploy_button, error='Charm config panel is not visible.')
+        deploy_button.click()

          # Zoom out so that it is possible to see the deployed service in
          # Saucelabs.  This also seems to fix a Firefox bug preventing the  
name


Index: app/templates/charm-token.handlebars
=== modified file 'app/templates/charm-token.handlebars'
--- app/templates/charm-token.handlebars	2013-06-04 18:38:30 +0000
+++ app/templates/charm-token.handlebars	2013-06-14 13:22:50 +0000
@@ -1,3 +1,6 @@
+{{! The charm-token class is used by the deploy method in
+    test/test_charm_running.py.  If you change this name, change the other
+    one too! }}
  <a href="/{{id}}"
      class="charm-token yui3-g {{size}}"
      data-charmid="{{id}}">


Index: app/subapps/browser/templates/browser_charm.handlebars
=== modified file 'app/subapps/browser/templates/browser_charm.handlebars'
--- app/subapps/browser/templates/browser_charm.handlebars	2013-06-05  
12:34:22 +0000
+++ app/subapps/browser/templates/browser_charm.handlebars	2013-06-14  
13:22:50 +0000
@@ -1,3 +1,4 @@
+
  <div class="charm yui3-g">
      <div class="content yui3-u-{{#if isFullscreen}}5-6{{else}}1{{/if}}">
          <div class="nav">
@@ -9,6 +10,9 @@
                      Close
                  {{/if}}
              </a>
+            {{! The add class is used by the deploy method in
+                test/test_charm_running.py.  If you change this name,  
change
+                the other one too! }}
              <a href="" class="add">Add</a>
              <a href="" class="share">
                  <img  
src="/juju-ui/assets/images/browser_share_button_icon.png"


Index: app/subapps/browser/templates/sidebar.handlebars
=== modified file 'app/subapps/browser/templates/sidebar.handlebars'
--- app/subapps/browser/templates/sidebar.handlebars	2013-04-22 03:35:20  
+0000
+++ app/subapps/browser/templates/sidebar.handlebars	2013-06-14 13:22:50  
+0000
@@ -1,3 +1,4 @@
+
  <div class="charmbrowser">
      <div id="bws-sidebar">
          <div class="bws-header">
@@ -5,6 +6,9 @@
          <div class="bws-content">
          </div>
      </div>
+    {{! The bws-view-data class is used by the deploy method in
+		test/test_charm_running.py.  If you change this name, change the other
+		one too! }}
      <div class="bws-view-data">
          <div></div>
      </div>