Merge lp:~bcsaller/juju-gui/bundlesOnIE into lp:juju-gui/experimental

[Benjamin Saller]

Normalize transform to fix IE test

IE uses spaces rather than ',' in transform/translate strings.

https://codereview.appspot.com/13441046/

[Benjamin Saller (bcsaller)]

Reviewers: mp+183642_code.launchpad.net,

Message:
Please take a look.

Description:
Normalize transform to fix IE test

IE uses spaces rather than ',' in transform/translate strings.

https://code.launchpad.net/~bcsaller/juju-gui/bundlesOnIE/+merge/183642

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M test/test_bundle_module.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_bundle_module.js
=== modified file 'test/test_bundle_module.js'
--- test/test_bundle_module.js 2013-08-30 21:28:11 +0000
+++ test/test_bundle_module.js 2013-09-03 10:38:09 +0000
@@ -70,6 +70,10 @@
          });
    }

+ function normalizeTranslate(translateStr) {
+ return translateStr.replace(',', ' ');
+ }
+
    it('should create a proper service for each model', function(done) {
      promiseBundle()
      .then(function(bundle) {
@@ -89,7 +93,8 @@
            assert.equal(service.attr('width'), '96');
            assert.equal(service.attr('height'), '96');
            // Annotations
- assert.equal(service.attr('transform'), 'translate(115,89)');
+ assert.equal(normalizeTranslate(service.attr('transform')),
+ 'translate(115 89)');
            // Ensure that we've exposed one service
            assert.equal(container.all('.exposed-indicator').size(), 1);
            var indicator = selection.select('.exposed-indicator');

[Madison Scott-Clary (makyo)]

Fixed as a drive-by in https://codereview.appspot.com/13235047/

https://codereview.appspot.com/13441046/

Unmerged revisions

997. By Benjamin Saller on 2013-09-03

merge trunk

996. By Benjamin Saller on 2013-09-03

make translate work on IE'

=== modified file 'test/test_bundle_module.js'
--- test/test_bundle_module.js	2013-08-30 21:28:11 +0000
+++ test/test_bundle_module.js	2013-09-03 12:29:28 +0000
@@ -70,6 +70,10 @@
         });
   }
 
+  function normalizeTranslate(translateStr) {
+    return translateStr.replace(',', ' ');
+  }
+
   it('should create a proper service for each model', function(done) {
     promiseBundle()
     .then(function(bundle) {
@@ -89,7 +93,8 @@
           assert.equal(service.attr('width'), '96');
           assert.equal(service.attr('height'), '96');
           // Annotations
-          assert.equal(service.attr('transform'), 'translate(115,89)');
+          assert.equal(normalizeTranslate(service.attr('transform')),
+                       'translate(115 89)');
           // Ensure that we've exposed one service
           assert.equal(container.all('.exposed-indicator').size(), 1);
           var indicator = selection.select('.exposed-indicator');