Merge lp:~bac/juju-gui/1083933 into lp:juju-gui/experimental

[Brad Crittenden]

Add tests for new viewport module.

Add tests for the new module. Also removed an unused function. It looked
useful but I didn't think it should hang around if not called. Ben might have
had a plan for it.

https://codereview.appspot.com/7085057/

[Brad Crittenden (bac)]

Reviewers: mp+143120_code.launchpad.net,

Message:
Please take a look.

Description:
Add tests for new viewport module.

Add tests for the new module. Also removed an unused function. It
looked
useful but I didn't think it should hang around if not called. Ben
might have
had a plan for it.

https://code.launchpad.net/~bac/juju-gui/1083933/+merge/143120

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M app/views/topology/viewport.js
   M test/index.html
   A test/test_viewport_module.js

[Madison Scott-Clary (makyo)]

Land as is, thanks for the tests.

https://codereview.appspot.com/7085057/

[lp:~bac/juju-gui/1083933]

318. By Brad Crittenden on 2013-01-14

Merge from trunk

[Brad Crittenden (bac)]

*** Submitted:

Add tests for new viewport module.

Add tests for the new module. Also removed an unused function. It
looked
useful but I didn't think it should hang around if not called. Ben
might have
had a plan for it.

R=matthew.scott, benji
CC=
https://codereview.appspot.com/7085057

https://codereview.appspot.com/7085057/

=== modified file 'app/views/topology/viewport.js'
--- app/views/topology/viewport.js	2013-01-08 17:52:24 +0000
+++ app/views/topology/viewport.js	2013-01-14 20:14:21 +0000
@@ -7,18 +7,6 @@
       d3ns = Y.namespace('d3');
 
   /**
-   * Utility function to get a number from a computed style.
-   * @method styleToNumber
-   */
-  function styleToNumber(selector, style, defaultSize) {
-    style = style || 'height';
-    defaultSize = defaultSize || 0;
-    return parseInt(Y.one(selector).getComputedStyle(style) || defaultSize,
-                    10);
-  }
-
-
-  /**
    * @module topology-viewport
    * @class ViewportModule
    * @namespace views
@@ -57,14 +45,13 @@
       // smallest size we accept--no smaller or bigger--or else the
       // presence or absence of scrollbars may affect our calculations
       // incorrectly.
-      canvas.setStyles({height: 600, width: 800});
+      canvas.setStyles({height: '600px', width: '800px'});
       var dimensions = utils.getEffectiveViewportSize(true, 800, 600);
       svg.setAttribute('width', dimensions.width);
       svg.setAttribute('height', dimensions.height);
       vis.attr('width', dimensions.width);
       vis.attr('height', dimensions.height);
 
-
       zoomPlane.setAttribute('width', dimensions.width);
       zoomPlane.setAttribute('height', dimensions.height);
       canvas.setStyles({
 
=== modified file 'test/index.html'
--- test/index.html	2013-01-10 18:17:46 +0000
+++ test/index.html	2013-01-14 20:14:21 +0000
@@ -54,6 +54,7 @@
   <script src="test_service_view.js"></script>
   <script src="test_unit_view.js"></script>
   <script src="test_utils.js"></script>
+  <script src="test_viewport_module.js"></script>
 
 
   <script>
 
=== added file 'test/test_viewport_module.js'
--- test/test_viewport_module.js	1970-01-01 00:00:00 +0000
+++ test/test_viewport_module.js	2013-01-14 20:14:21 +0000
@@ -0,0 +1,85 @@
+'use strict';
+
+describe('viewport module', function() {
+  var db, juju, models, viewContainer, views, Y, viewportModule;
+  before(function(done) {
+    Y = YUI(GlobalConfig).use(['node',
+      'juju-models',
+      'juju-views',
+      'juju-gui',
+      'juju-env',
+      'juju-tests-utils',
+      'node-event-simulate'],
+    function(Y) {
+      juju = Y.namespace('juju');
+      models = Y.namespace('juju.models');
+      views = Y.namespace('juju.views');
+      done();
+    });
+  });
+
+  beforeEach(function() {
+    viewContainer = Y.Node.create('<div />');
+    viewContainer.appendTo(Y.one('body'));
+    viewContainer.hide();
+    db = new models.Database();
+    var view = new views.environment(
+        { container: viewContainer,
+          db: db});
+    view.render();
+    view.rendered();
+    viewportModule = view.topo.modules.ViewportModule;
+  });
+
+  afterEach(function() {
+    if (viewContainer) {
+      viewContainer.remove(true);
+    }
+  });
+
+  it('should fire before and after events', function() {
+    var topo = viewportModule.get('component');
+    var events = [];
+    topo.fire = function(e) {
+      events.push(e);
+    };
+    viewportModule.resized();
+    events.should.eql(
+        ['beforePageSizeRecalculation',
+         'sizeChange',
+         'afterPageSizeRecalculation']);
+  });
+
+  it('should set canvas dimensions', function() {
+    var container = viewportModule.get('container');
+    var canvas = container.one('.topology-canvas');
+    // Initialize to absurd dimensions.
+    canvas.setStyles({height: '60px', width: '80px'});
+    viewportModule.resized();
+    canvas.getStyle('width').should.equal('800px');
+    canvas.getStyle('height').should.equal('600px');
+  });
+
+  it('should set zoom plane dimensions', function() {
+    var container = viewportModule.get('container');
+    var zoomPlane = container.one('.zoom-plane');
+    // Initialize to absurd dimensions.
+    zoomPlane.setAttribute('width', 10);
+    zoomPlane.setAttribute('height', 10);
+    viewportModule.resized();
+    zoomPlane.getAttribute('width').should.equal('800');
+    zoomPlane.getAttribute('height').should.equal('600');
+  });
+
+  it('should set svg dimensions', function() {
+    var container = viewportModule.get('container');
+    var svg = container.one('svg');
+    // Initialize to absurd dimensions.
+    svg.setAttribute('width', 10);
+    svg.setAttribute('height', 10);
+    viewportModule.resized();
+    svg.getAttribute('width').should.equal('800');
+    svg.getAttribute('height').should.equal('600');
+  });
+
+});