Merge lp:~hatch/juju-gui/ci-fixes into lp:juju-gui/experimental

[Jeff Pihach]

CI Fixes

Implements workaround for cross browser textarea
height offset issues and removes the shortened
timeout on the import tests

https://codereview.appspot.com/9204044/

[Jeff Pihach (hatch)]

Reviewers: mp+162533_code.launchpad.net,

Message:
Please take a look.

Description:
CI Fixes

Implements workaround for cross browser textarea
height offset issues and removes the shortened
timeout on the import tests

https://code.launchpad.net/~hatch/juju-gui/ci-fixes/+merge/162533

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M test/test_fakebackend.js
   M test/test_resizing_textarea.js

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_fakebackend.js
=== modified file 'test/test_fakebackend.js'
--- test/test_fakebackend.js 2013-05-02 18:56:43 +0000
+++ test/test_fakebackend.js 2013-05-05 16:38:39 +0000
@@ -287,7 +287,6 @@
      });

      describe('FakeBackend.importEnvironment', function(done) {
- this.timeout(300);

        it('rejects unauthenticated calls', function(done) {
          fakebackend.logout();

Index: test/test_resizing_textarea.js
=== modified file 'test/test_resizing_textarea.js'
--- test/test_resizing_textarea.js 2013-05-02 21:14:35 +0000
+++ test/test_resizing_textarea.js 2013-05-05 16:38:39 +0000
@@ -10,7 +10,7 @@

  describe('textarea autosize plugin', function() {

- var Y, test_text, container, textarea, target, target2, ie_fudge;
+ var Y, test_text, container, textarea, target, target2, kludge;

    before(function(done) {
      Y = YUI(GlobalConfig).use([
@@ -31,11 +31,13 @@

        // XXX: BradCrittenden 2013-05-02 bug=1175781: This work-around
        // is just temporary. The root cause needs to be found and fixed.
- ie_fudge = 0;
- if (Y.UA.ie === 10) {
+ // The test check properties are inverted and will need to be fixed.
+ kludge = 0;
+ if (Y.UA.ie === 10 || Y.UA.gecko) {
          // IE10 Computes sizes wrong.
- ie_fudge = 6;
+ kludge = 6;
        }
+
        done();
      });
    });
@@ -73,7 +75,7 @@
     *
     */
    function get_height(target) {
- return clean_size(target.getComputedStyle('height')) + ie_fudge;
+ return clean_size(target.getComputedStyle('height')) + kludge;
    }

    /**
@@ -235,7 +237,7 @@
      });

      target.show();
- var current_height = get_height(target) - ie_fudge;
+ var current_height = get_height(target) - kludge;
      assert.equal(300, current_height,
          'The height should start out at 300px per the min_height cfg');
    });

[Gary Poster (gary)]

Don't really understand the timeout, but I'll take it for now, assuming
Ben will fix later. Thank you very much! LGTM and land unless someone
objects soon. :-)

https://codereview.appspot.com/9204044/

[Jeff Pihach (hatch)]

*** Submitted:

CI Fixes

Implements workaround for cross browser textarea
height offset issues and removes the shortened
timeout on the import tests

R=gary.poster
CC=
https://codereview.appspot.com/9204044

https://codereview.appspot.com/9204044/

=== modified file 'test/test_fakebackend.js'
--- test/test_fakebackend.js	2013-05-02 18:56:43 +0000
+++ test/test_fakebackend.js	2013-05-05 16:43:27 +0000
@@ -287,7 +287,6 @@
     });
 
     describe('FakeBackend.importEnvironment', function(done) {
-      this.timeout(300);
 
       it('rejects unauthenticated calls', function(done) {
         fakebackend.logout();

=== modified file 'test/test_resizing_textarea.js'
--- test/test_resizing_textarea.js	2013-05-02 21:14:35 +0000
+++ test/test_resizing_textarea.js	2013-05-05 16:43:27 +0000
@@ -10,7 +10,7 @@
 
 describe('textarea autosize plugin', function() {
 
-  var Y, test_text, container, textarea, target, target2, ie_fudge;
+  var Y, test_text, container, textarea, target, target2, kludge;
 
   before(function(done) {
     Y = YUI(GlobalConfig).use([
@@ -31,11 +31,13 @@
 
       // XXX: BradCrittenden 2013-05-02 bug=1175781: This work-around
       // is just temporary.  The root cause needs to be found and fixed.
-      ie_fudge = 0;
-      if (Y.UA.ie === 10) {
+      // The test check properties are inverted and will need to be fixed.
+      kludge = 0;
+      if (Y.UA.ie === 10 || Y.UA.gecko) {
         // IE10 Computes sizes wrong.
-        ie_fudge = 6;
+        kludge = 6;
       }
+
       done();
     });
   });
@@ -73,7 +75,7 @@
    *
    */
   function get_height(target) {
-    return clean_size(target.getComputedStyle('height')) + ie_fudge;
+    return clean_size(target.getComputedStyle('height')) + kludge;
   }
 
   /**
@@ -235,7 +237,7 @@
     });
 
     target.show();
-    var current_height = get_height(target) - ie_fudge;
+    var current_height = get_height(target) - kludge;
     assert.equal(300, current_height,
         'The height should start out at 300px per the min_height cfg');
   });