Redo Service Placement

test/test_model.js

 /*
 This file is part of the Juju GUI, which lets users view and manage Juju
 environments within a graphical interface (https://launchpad.net/juju-gui).
 Copyright (C) 2012-2013 Canonical Ltd.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU Affero General Public License version 3, as published by
 the Free Software Foundation.
 
 This program is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
 SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
 General Public License for more details.
 
 You should have received a copy of the GNU Affero General Public License along
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 'use strict';
 
-describe('test_models.js', function() {
+describe('test_model.js', function() {
   describe('Charm initialization', function() {
     var models;
 
     before(function(done) {
       YUI(GlobalConfig).use('juju-models', 'juju-charm-models', function(Y) {
         models = Y.namespace('juju.models');
         done();
       });
     });
 
@@ skipping 758 matching lines @@
       });
     });
 
     beforeEach(function() {
       db = new models.Database();
       fakeStore = utils.makeFakeStore(db.charms);
       fakeStore.iconpath = function() {return 'fake url';};
     });
 
     it('can export in deployer format', function() {
+      // Mock a topology that can return positions.
+      var topology = {
+        service_boxes: {
+          wordpress: {
+              x: 100,
+              y: 200
+          },
+          mysql: {x: 0, y: 0}
+        }
+      };
+
       db.services.add({id: 'mysql', charm: 'precise/mysql-1'});
       db.services.add({
         id: 'wordpress',
         charm: 'precise/wordpress-1',
         config: {debug: 'no', username: 'admin'},
         constraints: 'cpu-power=2,cpu-cores=4',
-        annotations: {'gui-x': 100, 'gui-y': 200, 'ignored': true}
       });
       db.relations.add({
         id: 'relation-0',
         endpoints: [
           ['mysql', {name: 'db', role: 'server'}],
           ['wordpress', {name: 'app', role: 'client'}]],
         'interface': 'db'
       });
 
       db.environment.set('defaultSeries', 'precise');
 
       // Add the charms so we can resolve them in the export.
       db.charms.add([{id: 'precise/mysql-1'},
             {id: 'precise/wordpress-1',
               options: {
                 debug: {
                   'default': 'no'
                 },
                 username: {
                   'default': 'root'
                 }
               }
             }
           ]);
-      var result = db.exportDeployer().envExport;
+      var result = db.exportDeployer(topology).envExport;

[gary.poster, 2013/10/15 15:34:16]

Back to first comment: I'd hope this is no longer necessary.

[benjamin.saller, 2013/10/15 19:40:11]

It took some reworking to really get there, but it no longer is.

       var relation = result.relations[0];
 
       assert.equal(result.series, 'precise');
       assert.equal(result.services.mysql.charm, 'precise/mysql-1');
       assert.equal(result.services.wordpress.charm, 'precise/wordpress-1');
 
       // A default config value is skipped
       assert.equal(result.services.wordpress.options.debug, undefined);
       // A value changed from the default is exported
       assert.equal(result.services.wordpress.options.username, 'admin');
@@ skipping 68 matching lines @@
       assert.isFalse(mysql.hasErrors(), mysql.get('id'));
     });
 
     it('can be filtered so that it returns only visible models', function() {
       var filtered = list.visible();
       assert.strictEqual(2, filtered.size());
       assert.deepEqual([django, wordpress], filtered.toArray());
     });
   });
 });