Merge lp:~gary/juju-gui/removeCharmworldV3Flag into lp:juju-gui/experimental

[Gary Poster]

Remove charmworldv3 and APIv2

For QA, make sure that you can search for bundles (e.g., search for hatch) and make sure that the charm store seems to be working correctly.

https://codereview.appspot.com/22000043/

[Gary Poster (gary)]

Reviewers: mp+193978_code.launchpad.net,

Message:
Please take a look.

Description:
Remove charmworldv3 and APIv2

For QA, make sure that you can search for bundles (e.g., search for
hatch) and make sure that the charm store seems to be working correctly.

https://code.launchpad.net/~gary/juju-gui/removeCharmworldV3Flag/+merge/193978

(do not edit description out of merge proposal)

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

Affected files (+61, -578 lines):
   A [revision details]
   M app/app.js
   M app/store/charmworld.js
   M app/subapps/browser/browser.js
   M app/views/topology/bundle.js
   M test/test_app.js
   M test/test_browser_app.js
   M test/test_browser_charm_details.js
   M test/test_browser_editorial.js
   M test/test_browser_search_view.js
   M test/test_browser_search_widget.js
   M test/test_bundle_details_view.js
   M test/test_charmworld.js
   M test/test_environment_view.js
   M test/test_ghost_inspector.js
   M test/test_inspector_charm.js
   M test/test_inspector_constraints.js
   M test/test_inspector_overview.js
   M test/test_inspector_settings.js
   M test/test_model.js
   M test/test_service_module.js
   M test/utils.js

[Richard Harding (rharding)]

code looks good, checking qa

https://codereview.appspot.com/22000043/

[Richard Harding (rharding)]

LGTM qa-ok. Thanks for the update Here we goooooo!

https://codereview.appspot.com/22000043/

[Brad Crittenden (bac)]

LGTM, no qa

https://codereview.appspot.com/22000043/

[Gary Poster (gary)]

*** Submitted:

Remove charmworldv3 and APIv2

For QA, make sure that you can search for bundles (e.g., search for
hatch) and make sure that the charm store seems to be working correctly.

R=rharding, bac
CC=
https://codereview.appspot.com/22000043

https://codereview.appspot.com/22000043/

[Gary Poster (gary)]

Thank you both!

https://codereview.appspot.com/22000043/

=== modified file 'app/app.js'
--- app/app.js	2013-10-30 11:59:48 +0000
+++ app/app.js	2013-11-05 18:17:46 +0000
@@ -1222,8 +1222,8 @@
       },
       /**
          @attribute store
-         @default Y.juju.charmworld.APIv2
-         @type {Y.juju.charmworld.APIv2}
+         @default Y.juju.charmworld.APIv3
+         @type {Y.juju.charmworld.APIv3}
        */
       store: {
         /**
@@ -1245,11 +1245,7 @@
           } else {
             cfg.apiHost = window.juju_config.charmworldURL;
           }
-          if (window.flags.charmworldv3) {
-            return new Y.juju.charmworld.APIv3(cfg);
-          } else {
-            return new Y.juju.charmworld.APIv2(cfg);
-          }
+          return new Y.juju.charmworld.APIv3(cfg);
         }
       },
 

=== modified file 'app/store/charmworld.js'
--- app/store/charmworld.js	2013-10-25 23:49:42 +0000
+++ app/store/charmworld.js	2013-11-05 18:17:46 +0000
@@ -598,221 +598,6 @@
     }
   });
 
-  /**
-   * Charmworld API version 2 interface.
-   *
-   * @class APIv2
-   * @extends {APIv3}
-   *
-   * This class inherits from the v3 version of the API so that removing v2
-   * once it is no longer needed will be easy (just delete this class, the one
-   * or two places it is referenced in the code, and its associated tests).
-   *
-   */
-  ns.APIv2 = Y.Base.create('APIv2', ns.APIv3, [], {
-    _apiRoot: 'api/2',
-
-    /**
-     * API call to fetch autocomplete suggestions based on the current term.
-     *
-     * @method autocomplete
-     * @param {Object} query the filters data object for search.
-     * @param {Object} filters the filters data object for search.
-     * @param {Object} callbacks the success/failure callbacks to use.
-     * @param {Object} bindScope the scope of *this* in the callbacks.
-     */
-    autocomplete: function(filters, callbacks, bindScope) {
-      var endpoint = 'charms';
-      // Force that this is an autocomplete call to perform matching on the
-      // start of names vs a fulltext search.
-      filters.autocomplete = 'true';
-      filters.limit = 5;
-      if (bindScope) {
-        callbacks.success = Y.bind(callbacks.success, bindScope);
-        callbacks.failure = Y.bind(callbacks.failure, bindScope);
-      }
-      this._makeRequest(endpoint, callbacks, filters);
-    },
-
-    /**
-     * API call to fetch a charm's details, with an optional local cache.
-     *
-     * @method charmWithCache
-     * @param {String} charmID The charm to fetch This is the fully qualified
-     *   charm name in the format scheme:series/charm-revision.
-     * @param {Object} callbacks The success/failure callbacks to use.
-     * @param {Object} bindScope The scope of "this" in the callbacks.
-     * @param {ModelList} [cache] a local cache of browser charms.
-     * @param {String} [defaultSeries='precise'] The series to use if none is
-     *  specified in the charm ID.
-     */
-    charm: function(charmID, callbacks, bindScope, cache, defaultSeries) {
-      if (bindScope) {
-        callbacks.success = Y.bind(callbacks.success, bindScope);
-      }
-      if (cache) {
-        var charm = cache.getById(charmID);
-        if (charm) {
-          // If the charm was found in the cache, then we can declare success
-          // without ever making a request to charmworld.
-          Y.soon(function() {
-            // Since there wasn't really a request, there is no data, so we
-            // pass an empty object as the "data" parameter.
-            callbacks.success({}, charm);
-          });
-          return;
-        } else {
-          var successCB = callbacks.success;
-          callbacks.success = function(data) {
-            var charm = new Y.juju.models.Charm(data.charm);
-            if (data.metadata) {
-              charm.set('metadata', data.metadata);
-            }
-            cache.add(charm);
-            successCB(data, charm);
-          };
-        }
-      }
-      charmID = this.apiHelper.normalizeCharmId(charmID, defaultSeries);
-      // If the charm ID does not have a revision number (or "HEAD"), add one.
-      if (/\-(\d+|HEAD)/.exec(charmID) === null) {
-        // Add in a revision placeholder.  Any value will do, v2 of the
-        // charmworld API ignores revision numbers.
-        charmID = charmID + '-1';
-      }
-      this._charm(charmID, callbacks, bindScope);
-    },
-
-    /**
-      Promises to return the latest charm ID for a given charm if a newer one
-      exists; this also caches the newer charm if one is available.
-
-      @method promiseUpgradeAvailability
-      @param {Charm} charm An existing charm potentially in need of an upgrade.
-      @param {ModelList} cache A local cache of browser charms.
-      @return {Promise} A promise for a newer charm ID or undefined.
-    */
-    promiseUpgradeAvailability: function(charm, cache) {
-      // Get the charm's store ID, then replace the version number
-      // with '-HEAD' to retrieve the latest version of the charm.
-      var storeId, revision;
-      if (charm instanceof Y.Model) {
-        storeId = charm.get('storeId');
-        revision = parseInt(charm.get('revision'), 10);
-      } else {
-        storeId = charm.url;
-        revision = parseInt(charm.revision, 10);
-      }
-      storeId = storeId.replace(/-\d+$/, '-HEAD');
-      // XXX By using a cache we hide charm versions that have become available
-      // since we last requested the most recent version.
-      return this.promiseCharm(storeId, cache)
-        .then(function(latest) {
-            var latestVersion = parseInt(latest.charm.id.split('-').pop(), 10);
-            if (latestVersion > revision) {
-              return latest.charm.id;
-            }
-          }, function(e) {
-            throw e;
-          });
-    },
-
-    /**
-     * API call to search charms
-     *
-     * @method search
-     * @param {Object} filters the filters data object for search.
-     * @param {Object} callbacks the success/failure callbacks to use.
-     * @param {Object} bindScope the scope of *this* in the callbacks.
-     */
-    search: function(filters, callbacks, bindScope) {
-      var endpoint = 'charms';
-      if (bindScope) {
-        callbacks.success = Y.bind(callbacks.success, bindScope);
-        callbacks.failure = Y.bind(callbacks.failure, bindScope);
-      }
-      this._makeRequest(endpoint, callbacks, filters);
-    },
-
-    /**
-      Generate the API path to a charm icon.
-      This is useful when generating links and references in HTML to the
-      charm's icon and is constructing the correct icon based on reviewed
-      status and categories on the charm.
-
-      @method iconpath
-      @param {String} charmID The id of the charm to grab the icon for.
-      @return {String} The URL of the charm's icon.
-     */
-    iconpath: function(charmID) {
-      // If this is a local charm, then we need use a hard coded path to the
-      // default icon since we cannot fetch its category data or its own
-      // icon.
-      // XXX: #1202703 - this is a short term fix for the bug. Need longer
-      // term solution.
-      if (charmID.indexOf('local:') === 0) {
-        return this.get('apiHost') +
-            'static/img/charm_160.svg';
-
-      } else {
-        // Get the charm ID from the service.  In some cases, this will be
-        // the charm URL with a protocol, which will need to be removed.
-        // The following regular expression removes everything up to the
-        // colon portion of the quote and leaves behind a charm ID.
-        charmID = charmID.replace(/^[^:]+:/, '');
-        return this.get('apiHost') + [
-          this._apiRoot,
-          'charm',
-          charmID,
-          'icon.svg'].join('/');
-      }
-    },
-
-    /**
-     * Given a result list, turn that into an array of charm objects for the
-     * application to use. Metadata is appended to the charm or bundle as the
-     * 'metadata' attribute.
-     *
-     * @method transformResults
-     * @param {Object} JSON decoded data from response.
-     * @return {Array} List of charm objects.
-     *
-     */
-    transformResults: function(data) {
-      // Remove non-charms (bundles) from the data.
-      data = Y.Array.filter(data, function(charmData) {
-        return Y.Lang.isValue(charmData.charm);
-      });
-      // Append the metadata to the actual charm object.
-      data = Y.Array.map(data, function(charmData) {
-        var charm = new Y.juju.models.Charm(charmData.charm);
-        if (charmData.metadata) {
-          charm.set('metadata', charmData.metadata);
-        }
-        return charm;
-      });
-      return data;
-    },
-
-    /**
-     * Fetch the interesting landing content from the charmworld API.
-     *
-     * @method interesting
-     * @return {Object} data loaded from the API call.
-     *
-     */
-    interesting: function(callbacks, bindScope) {
-      if (bindScope) {
-        callbacks.success = Y.bind(callbacks.success, bindScope);
-        callbacks.failure = Y.bind(callbacks.failure, bindScope);
-      }
-
-      this._makeRequest('charms/interesting', callbacks);
-    }
-  }, {
-    ATTRS: {}
-  });
-
 }, '0.1.0', {
   requires: [
     'datasource-io',

=== modified file 'app/subapps/browser/browser.js'
--- app/subapps/browser/browser.js	2013-10-30 11:59:48 +0000
+++ app/subapps/browser/browser.js	2013-11-05 18:17:46 +0000
@@ -1112,7 +1112,7 @@
 
       /**
          @attribute store
-         @default juju.charmworld.APIv2
+         @default juju.charmworld.APIv3
          @type {Object}
        */
       store: {},

=== modified file 'app/views/topology/bundle.js'
--- app/views/topology/bundle.js	2013-11-01 18:12:36 +0000
+++ app/views/topology/bundle.js	2013-11-05 18:17:46 +0000
@@ -371,7 +371,7 @@
     }
     this.store = options.store;
     if (!this.store) {
-      this.store = new juju.charmworld.APIv2({});
+      this.store = new juju.charmworld.APIv3({});
       this._cleanups.push(this.store.destroy);
     }
     this.container = options.container;

=== modified file 'test/test_app.js'
--- test/test_app.js	2013-09-27 15:46:09 +0000
+++ test/test_app.js	2013-11-05 18:17:46 +0000
@@ -514,7 +514,7 @@
             consoleEnabled: true,
             user: 'admin',
             password: 'admin',
-            store: new Y.juju.charmworld.APIv2({})
+            store: new Y.juju.charmworld.APIv3({})
           });
       app.showView(new Y.View());
       // This simply walks through the hierarchy to show that all the

=== modified file 'test/test_browser_app.js'
--- test/test_browser_app.js	2013-10-30 13:23:16 +0000
+++ test/test_browser_app.js	2013-11-05 18:17:46 +0000
@@ -75,7 +75,7 @@
       it('must correctly render the initial browser ui', function() {
         var container = Y.one('#subapp-browser');
         view = new FullScreen({
-          store: new Y.juju.charmworld.APIv2({
+          store: new Y.juju.charmworld.APIv3({
             apiHost: 'http://localhost'
           })
         });
@@ -108,7 +108,7 @@
 
       it('must show the home icons when withHome is set', function() {
         var container = Y.one('#subapp-browser'),
-            fakeStore = new Y.juju.charmworld.APIv2({});
+            fakeStore = new Y.juju.charmworld.APIv3({});
 
         view = new FullScreen({
           store: fakeStore,
@@ -122,7 +122,7 @@
 
       it('shows the home icons if the withHome is changed', function(done) {
         var container = Y.one('#subapp-browser'),
-            fakeStore = new Y.juju.charmworld.APIv2({});
+            fakeStore = new Y.juju.charmworld.APIv3({});
 
         view = new FullScreen({
           store: fakeStore
@@ -140,7 +140,7 @@
 
       it('routes home when it catches a gohome event', function(done) {
         var container = Y.one('#subapp-browser'),
-            fakeStore = new Y.juju.charmworld.APIv2({});
+            fakeStore = new Y.juju.charmworld.APIv3({});
         view = new FullScreen({
           store: fakeStore
         });
@@ -159,7 +159,7 @@
 
       it('resets charmid and hash on search', function(done) {
         var container = Y.one('#subapp-browser'),
-            fakeStore = new Y.juju.charmworld.APIv2({});
+            fakeStore = new Y.juju.charmworld.APIv3({});
         view = new FullScreen({
           charmID: 'precise/jenkins-13'
         });
@@ -179,7 +179,7 @@
 
       it('picks up the search widget deploy event', function(done) {
         var container = utils.makeContainer('subapp-browser'),
-            fakeStore = new Y.juju.charmworld.APIv2({});
+            fakeStore = new Y.juju.charmworld.APIv3({});
         view = new FullScreen({
           charmID: 'precise/jenkins-13',
           store: fakeStore
@@ -300,7 +300,7 @@
         var container = Y.one('#subapp-browser');
         view = new Sidebar({
           container: container,
-          store: new Y.juju.charmworld.APIv2({
+          store: new Y.juju.charmworld.APIv3({
             apiHost: 'http://localhost'
           })
         });
@@ -343,7 +343,7 @@
       it('shows the home icon when instructed', function() {
         var container = Y.one('#subapp-browser');
         view = new Sidebar({
-          store: new Y.juju.charmworld.APIv2({
+          store: new Y.juju.charmworld.APIv3({
             apiHost: 'http://localhost'
           }),
           withHome: true
@@ -374,7 +374,7 @@
 
       it('routes home when it catches a gohome event', function(done) {
         var container = Y.one('#subapp-browser'),
-            fakeStore = new Y.juju.charmworld.APIv2({});
+            fakeStore = new Y.juju.charmworld.APIv3({});
         view = new Sidebar({
           store: fakeStore
         });
@@ -392,7 +392,7 @@
 
       it('picks up the search widget deploy event', function(done) {
         var container = utils.makeContainer('subapp-browser'),
-            fakeStore = new Y.juju.charmworld.APIv2({});
+            fakeStore = new Y.juju.charmworld.APIv3({});
         view = new Sidebar({
           charmID: 'precise/jenkins-13',
           store: fakeStore
@@ -424,7 +424,7 @@
             'juju-views',
             'subapp-browser', function(Y) {
               browser = Y.namespace('juju.subapps');
-              CharmworldAPI = Y.namespace('juju').charmworld.APIv2;
+              CharmworldAPI = Y.namespace('juju').charmworld.APIv3;
               next = function() {};
               done();
             });

=== modified file 'test/test_browser_charm_details.js'
--- test/test_browser_charm_details.js	2013-10-30 13:23:16 +0000
+++ test/test_browser_charm_details.js	2013-11-05 18:17:46 +0000
@@ -141,7 +141,7 @@
     });
 
     it('has sharing links', function() {
-      var fakeStore = new Y.juju.charmworld.APIv2({});
+      var fakeStore = new Y.juju.charmworld.APIv3({});
       fakeStore.set('datasource', {
         sendRequest: function(params) {
           // Stubbing the server callback value
@@ -278,7 +278,7 @@
     });
 
     it('should be able to display the readme content', function() {
-      var fakeStore = new Y.juju.charmworld.APIv2({});
+      var fakeStore = new Y.juju.charmworld.APIv3({});
       fakeStore.set('datasource', {
         sendRequest: function(params) {
           // Stubbing the server callback value
@@ -338,7 +338,7 @@
 
 
     it('_addCharmEnvironment displays the config panel', function(done) {
-      var fakeStore = new Y.juju.charmworld.APIv2({});
+      var fakeStore = new Y.juju.charmworld.APIv3({});
       fakeStore.iconpath = function() {
         return 'charm icon url';
       };
@@ -368,7 +368,7 @@
     });
 
     it('should load a file when a hook is selected', function() {
-      var fakeStore = new Y.juju.charmworld.APIv2({});
+      var fakeStore = new Y.juju.charmworld.APIv3({});
       fakeStore.set('datasource', {
         sendRequest: function(params) {
           // Stubbing the server callback value
@@ -408,7 +408,7 @@
     });
 
     it('should be able to render markdown as html', function() {
-      var fakeStore = new Y.juju.charmworld.APIv2({});
+      var fakeStore = new Y.juju.charmworld.APIv3({});
       fakeStore.set('datasource', {
         sendRequest: function(params) {
           // Stubbing the server callback value
@@ -516,7 +516,7 @@
       data.scores = null;
       var fakedata = Y.JSON.stringify(data);
 
-      var fakeStore = new Y.juju.charmworld.APIv2({});
+      var fakeStore = new Y.juju.charmworld.APIv3({});
       fakeStore.set('datasource', {
         sendRequest: function(params) {
           // Stubbing the server callback value
@@ -864,7 +864,7 @@
       // We don't want any files so we don't have to mock/load them.
       data.files = [];
 
-      var fakeStore = new Y.juju.charmworld.APIv2({});
+      var fakeStore = new Y.juju.charmworld.APIv3({});
       fakeStore.set('datasource', {
         sendRequest: function(params) {
           // Stubbing the server callback value
@@ -910,7 +910,7 @@
       // We don't want any files so we don't have to mock/load them.
       data.files = [];
 
-      var fakeStore = new Y.juju.charmworld.APIv2({});
+      var fakeStore = new Y.juju.charmworld.APIv3({});
       fakeStore.set('datasource', {
         sendRequest: function(params) {
           // Stubbing the server callback value
@@ -945,7 +945,7 @@
       // We don't want any files so we don't have to mock/load them.
       data.files = [];
 
-      var fakeStore = new Y.juju.charmworld.APIv2({});
+      var fakeStore = new Y.juju.charmworld.APIv3({});
       fakeStore.set('datasource', {
         sendRequest: function(params) {
           // Stubbing the server callback value
@@ -996,7 +996,7 @@
       // We don't want any files so we don't have to mock/load them.
       data.files = [];
 
-      var fakeStore = new Y.juju.charmworld.APIv2({});
+      var fakeStore = new Y.juju.charmworld.APIv3({});
       fakeStore.set('datasource', {
         sendRequest: function(params) {
           // Stubbing the server callback value.

=== modified file 'test/test_browser_editorial.js'
--- test/test_browser_editorial.js	2013-09-30 22:59:57 +0000
+++ test/test_browser_editorial.js	2013-11-05 18:17:46 +0000
@@ -72,7 +72,7 @@
     });
 
     it('renders sidebar with hidden charms', function() {
-      fakeStore = new Y.juju.charmworld.APIv2({});
+      fakeStore = new Y.juju.charmworld.APIv3({});
       fakeStore.set('datasource', {
         sendRequest: function(params) {
           // Stubbing the server callback value
@@ -93,7 +93,7 @@
 
     it('shows and hides an indicator', function(done) {
       var hit = 0;
-      fakeStore = new Y.juju.charmworld.APIv2({});
+      fakeStore = new Y.juju.charmworld.APIv3({});
       fakeStore.set('datasource', {
         sendRequest: function(params) {
           // Stubbing the server callback value
@@ -120,7 +120,7 @@
     });
 
     it('renders fullscreen 14/22 charms hidden', function() {
-      fakeStore = new Y.juju.charmworld.APIv2({});
+      fakeStore = new Y.juju.charmworld.APIv3({});
       fakeStore.set('datasource', {
         sendRequest: function(params) {
           // Stubbing the server callback value
@@ -141,7 +141,7 @@
     });
 
     it('clicking a charm navigates for fullscreen', function(done) {
-      fakeStore = new Y.juju.charmworld.APIv2({});
+      fakeStore = new Y.juju.charmworld.APIv3({});
       fakeStore.set('datasource', {
         sendRequest: function(params) {
           // Stubbing the server callback value
@@ -169,7 +169,7 @@
     });
 
     it('clicking a charm navigates for sidebar', function(done) {
-      fakeStore = new Y.juju.charmworld.APIv2({});
+      fakeStore = new Y.juju.charmworld.APIv3({});
       fakeStore.set('datasource', {
         sendRequest: function(params) {
           // Stubbing the server callback value
@@ -196,7 +196,7 @@
     });
 
     it('setting the activeID marks the div active', function() {
-      fakeStore = new Y.juju.charmworld.APIv2({});
+      fakeStore = new Y.juju.charmworld.APIv3({});
       fakeStore.set('datasource', {
         sendRequest: function(params) {
           // Stubbing the server callback value
@@ -217,7 +217,7 @@
     });
 
     it('unsetting the activeID will remove the active markings', function() {
-      fakeStore = new Y.juju.charmworld.APIv2({});
+      fakeStore = new Y.juju.charmworld.APIv3({});
       fakeStore.set('datasource', {
         sendRequest: function(params) {
           // Stubbing the server callback value
@@ -255,7 +255,7 @@
     });
 
     it('uses passed in cache data if available', function() {
-      fakeStore = new Y.juju.charmworld.APIv2({});
+      fakeStore = new Y.juju.charmworld.APIv3({});
       fakeStore.set('datasource', {
         sendRequest: function(params) {
           // Stubbing the server callback value

=== modified file 'test/test_browser_search_view.js'
--- test/test_browser_search_view.js	2013-09-30 20:57:01 +0000
+++ test/test_browser_search_view.js	2013-11-05 18:17:46 +0000
@@ -53,7 +53,7 @@
     //
     // Create monkeypatched store to verify right method is called.
     apiURL = '';
-    var fakeStore = new Y.juju.charmworld.APIv2({});
+    var fakeStore = new Y.juju.charmworld.APIv3({});
     var sampleData = {
       result: [{
         charm: {
@@ -98,7 +98,7 @@
   it('renders correctly', function() {
     view.render();
     var container = view.get('container');
-    assert.equal('charms?text=foo', apiURL);
+    assert.equal('search?text=foo', apiURL);
     assert.equal(1, container.all('.yui3-token').size());
     var charmText = container.one('.yui3-token').one('.title').get('text');
     assert.equal(charmText.replace(/\s+/g, ''), 'bar');
@@ -121,7 +121,7 @@
   it('handles empty text for search', function() {
     view.set('filters', {text: ''});
     view.render();
-    assert.equal('charms?text=', apiURL);
+    assert.equal('search?text=', apiURL);
   });
 
   it('clicking a charm navigates for fullscreen', function(done) {
@@ -161,7 +161,7 @@
         }
       }]
     };
-    var fakeStore = new Y.juju.charmworld.APIv2({});
+    var fakeStore = new Y.juju.charmworld.APIv3({});
     fakeStore.set('datasource', {
       sendRequest: function(params) {
         // Stubbing the server callback value
@@ -204,7 +204,7 @@
         }
       }]
     };
-    var fakeStore = new Y.juju.charmworld.APIv2({});
+    var fakeStore = new Y.juju.charmworld.APIv3({});
     fakeStore.set('datasource', {
       sendRequest: function(params) {
         // Stubbing the server callback value
@@ -291,7 +291,7 @@
         }
       }]
     };
-    var fakeStore = new Y.juju.charmworld.APIv2({});
+    var fakeStore = new Y.juju.charmworld.APIv3({});
     fakeStore.set('datasource', {
       sendRequest: function(params) {
         // Stubbing the server callback value

=== modified file 'test/test_browser_search_widget.js'
--- test/test_browser_search_widget.js	2013-11-04 16:40:41 +0000
+++ test/test_browser_search_widget.js	2013-11-05 18:17:46 +0000
@@ -223,7 +223,7 @@
     cleanIconHelper = utils.stubCharmIconPath();
 
     // We need a valid store instance to send back the data.
-    fakeStore = new Y.juju.charmworld.APIv2({});
+    fakeStore = new Y.juju.charmworld.APIv3({});
     fakeStore.set('datasource', {
       sendRequest: function(params) {
         // Stubbing the server callback value

=== modified file 'test/test_bundle_details_view.js'
--- test/test_bundle_details_view.js	2013-11-01 17:39:04 +0000
+++ test/test_bundle_details_view.js	2013-11-05 18:17:46 +0000
@@ -68,7 +68,7 @@
     container = utils.makeContainer();
     container.append('<div class="bws-view-data"></div>');
     var defaults = {
-      store: utils.makeFakeStore(3),
+      store: utils.makeFakeStore(),
       db: {},
       entityId: data.id,
       renderTo: container

=== modified file 'test/test_charmworld.js'
--- test/test_charmworld.js	2013-10-08 23:15:39 +0000
+++ test/test_charmworld.js	2013-11-05 18:17:46 +0000
@@ -248,7 +248,7 @@
     });
 
     it('finds upgrades for charms - upgrade available', function(done) {
-      var store = utils.makeFakeStore(3);
+      var store = utils.makeFakeStore();
       var charm = new models.Charm({url: 'cs:precise/wordpress-10'});
       store.promiseUpgradeAvailability(charm)
         .then(function(upgrade) {
@@ -261,7 +261,7 @@
     });
 
     it('finds upgrades for charms - no upgrade available', function(done) {
-      var store = utils.makeFakeStore(3);
+      var store = utils.makeFakeStore();
       var charm = new models.Charm({url: 'cs:precise/wordpress-15'});
       store.promiseUpgradeAvailability(charm)
         .then(function(upgrade) {
@@ -274,7 +274,7 @@
     });
 
     it('copies metadata while transforming results', function() {
-      var store = utils.makeFakeStore(3);
+      var store = utils.makeFakeStore();
       var fakebundle = {bundle: {id: 'bundle0'},
                          metadata: 'bundledata'};
       var fakecharm = {charm: {url: 'cs:precise/wordpress-15'},
@@ -295,266 +295,6 @@
 
   });
 
-  // The tests below are based on copies of the v3 tests above so that removing
-  // support for the v2 charmworld API will be easy.  However, it means that
-  // any edits made to these tests may need to be made to the v3 tests above.
-  describe('Charmworld API v2 interface', function() {
-    var Y, models, conn, data, juju, utils, charmworld,
-        hostname, api;
-
-
-    before(function(done) {
-      Y = YUI(GlobalConfig).use(
-          'datasource-local', 'json-stringify', 'juju-charm-store',
-          'datasource-io', 'io', 'array-extras', 'juju-charm-models',
-          'juju-tests-utils',
-          function(Y) {
-            juju = Y.namespace('juju');
-            charmworld = Y.namespace('juju.charmworld');
-            models = Y.namespace('juju.models');
-            utils = Y.namespace('juju-tests').utils;
-            done();
-          });
-    });
-
-    beforeEach(function() {
-      hostname = 'http://charmworld.example/';
-      api = new charmworld.APIv2({apiHost: hostname});
-    });
-
-    it('constructs the api url correctly based on apiHost', function() {
-      var ds = api.get('datasource');
-
-      ds.get('source').should.eql(hostname + 'api/2/');
-
-      // And it should work without a trailing / as well.
-      hostname = hostname.slice(0, -1);
-      api = new charmworld.APIv2({apiHost: hostname});
-      ds = api.get('datasource');
-      ds.get('source').should.eql(hostname + '/api/2/');
-    });
-
-    it('handles loading interesting content correctly', function(done) {
-      var data = [];
-
-      data.push({responseText: Y.JSON.stringify({summary: 'wowza'})});
-      api.set('datasource', new Y.DataSource.Local({source: data}));
-
-      api.interesting({
-        success: function(data) {
-          data.summary.should.equal('wowza');
-          done();
-        },
-        failure: function(data, request) {
-        }
-      }, this);
-
-    });
-
-    it('handles searching correctly', function(done) {
-      var data = [],
-          url;
-      data.push({responseText: Y.JSON.stringify({name: 'foo'})});
-      // Create a monkeypatched datasource we can use to track the generated
-      // apiEndpoint
-      var datasource = new Y.DataSource.Local({source: data});
-      datasource.realSendRequest = datasource.sendRequest;
-      datasource.sendRequest = function(params) {
-        url = params.request;
-        datasource.realSendRequest(params);
-      };
-
-      api.set('datasource', datasource);
-      api.search({text: 'foo'}, {
-        success: function(data) {
-          assert.equal('charms?text=foo', url);
-          assert.equal('foo', data.name);
-          done();
-        },
-        failure: function(data, request) {
-        }
-      }, this);
-      api.destroy();
-    });
-
-    it('constructs cateogry icon paths correctly', function() {
-      var iconPath = api.buildCategoryIconPath('app-servers');
-      assert.equal(
-          iconPath,
-          hostname + 'static/img/category-app-servers-bw.svg');
-    });
-
-    it('makes charm requests to correct URL', function(done) {
-      api._makeRequest = function(endpoint, callbacks, filters) {
-        assert.equal(endpoint, 'charm/CHARM-ID');
-        done();
-      };
-
-      api._charm('CHARM-ID');
-    });
-
-    it('can use a cache to avoid requesting charm data', function(done) {
-      var should_not_happen = function() {
-        assert.isTrue(false, 'Oops, this should not have been called.');
-        done();
-      };
-      var CACHED_CHARM = 'CACHED-CHARM';
-
-      var callbacks = {
-        success: function(data, charm) {
-          assert.equal(charm, CACHED_CHARM);
-          done();
-        },
-        failure: should_not_happen
-      };
-
-      api._makeRequest = should_not_happen;
-
-      var cache = {
-        getById: function(charmID) {
-          return CACHED_CHARM;
-        }};
-
-      api.charm('CHARM-ID', callbacks, false, cache);
-
-    });
-
-    it('will make a request on a cache miss', function(done) {
-      var should_not_happen = function() {
-        assert.isTrue(false, 'Oops, this should not have been called.');
-        done();
-      };
-      var CACHED_CHARM = 'CACHED-CHARM';
-
-      var callbacks = {
-        success: function(data, charm) {
-          assert.equal(charm, CACHED_CHARM);
-          done();
-        },
-        failure: should_not_happen
-      };
-
-      api._makeRequest = function() {
-        // If this was called, then the test is successful.
-        done();
-      };
-
-      var cache = {
-        getById: function(charmID) {
-          return null;
-        }};
-
-      api.charm('CHARM-ID', callbacks, false, cache);
-
-    });
-
-    it('makes autocomplete requests to correct URL', function(done) {
-      var noop = function() {};
-
-      api._makeRequest = function(endpoint, callbacks, filters) {
-        assert.equal(endpoint, 'charms');
-        done();
-      };
-
-      api.autocomplete({text: 'mys'}, {'success': noop});
-    });
-
-    it('makes autocomplete requests with right query flag', function(done) {
-      var noop = function() {};
-
-      api._makeRequest = function(endpoint, callbacks, filters) {
-        assert.equal(filters.autocomplete, 'true');
-        done();
-      };
-
-      api.autocomplete({text: 'mys'}, {'success': noop});
-    });
-
-    it('constructs iconpaths correctly', function() {
-      var iconPath = api.iconpath('precise/mysql-1');
-      assert.equal(iconPath, hostname + 'api/2/charm/precise/mysql-1/icon.svg');
-    });
-
-    it('constructs an icon path for local charms', function() {
-      var iconPath = api.iconpath('local:precise/mysql-1');
-      assert.equal(iconPath, hostname + 'static/img/charm_160.svg');
-    });
-
-    it('splits the charm id to remove cs: when necessary', function() {
-      var iconPath = api.iconpath('cs:precise/mysql-1');
-      assert.equal(iconPath, hostname + 'api/2/charm/precise/mysql-1/icon.svg');
-    });
-
-    it('can fetch a charm via a promise', function(done) {
-      // The "promiseCharm" method is just a promise-wrapped version of the
-      // "charm" method.
-      var DATA = 'DATA';
-      var CHARM = 'CHARM';
-      api.charm = function(charmID, callbacks) {
-        callbacks.success(DATA, CHARM);
-      };
-      api.promiseCharm('CHARM-ID', null, 'precise')
-        .then(function(data) {
-            assert.equal(data, DATA);
-            done();
-          });
-    });
-
-    it('finds upgrades for charms - upgrade available', function(done) {
-      var store = utils.makeFakeStore();
-      var charm = new models.Charm({url: 'cs:precise/wordpress-10'});
-      store.promiseUpgradeAvailability(charm)
-        .then(function(upgrade) {
-            assert.equal(upgrade, 'precise/wordpress-15');
-            done();
-          }, function(error) {
-            assert.isTrue(false, 'We should not get here.');
-            done();
-          });
-    });
-
-    it('finds upgrades for charms - no upgrade available', function(done) {
-      var store = utils.makeFakeStore();
-      var charm = new models.Charm({url: 'cs:precise/wordpress-15'});
-      store.promiseUpgradeAvailability(charm)
-        .then(function(upgrade) {
-            assert.isUndefined(upgrade);
-            done();
-          }, function(error) {
-            assert.isTrue(false, 'We should not get here');
-            done();
-          });
-    });
-
-    it('filters results into an array of charms while removing bundles',
-        function() {
-          var store = utils.makeFakeStore();
-          var fakecharm = {charm: {url: 'cs:precise/wordpress-15'}};
-          var fakebundle = {bundle: {id: 'bundle0'}};
-          var other = {foo: {id: 'foo0'}};
-          var results = store.transformResults([fakecharm, fakebundle, other]);
-          var expected = [new models.Charm(fakecharm.charm)];
-          assert.equal(expected.length, results.length);
-          assert.equal(expected[0].get('id'), results[0].get('id'));
-        });
-
-    it('copies metadata while transforming results', function() {
-      var store = utils.makeFakeStore();
-      var fakebundle = {bundle: {id: 'bundle0'},
-                         metadata: 'bundledata'};
-      var fakecharm = {charm: {url: 'cs:precise/wordpress-15'},
-                        metadata: 'charmdata'};
-      var testdata = Y.clone([fakecharm, fakebundle]);
-      fakebundle.bundle.metadata = fakebundle.metadata;
-      fakecharm.charm.metadata = fakecharm.metadata;
-      var expected = [new models.Charm(fakecharm.charm)];
-      var results = store.transformResults(testdata);
-      assert.equal(expected.length, results.length);
-      assert.equal(expected[0].get('id'), results[0].get('id'));
-      assert.equal(expected[0].get('metadata'), results[0].get('metadata'));
-    });
-  });
-
   describe('Charmworld API Helper', function() {
     var Y, models, conn, data, juju, utils, charmworld, hostname;
 
@@ -602,39 +342,4 @@
 
   });
 
-  describe('Charmworld API feature flag support', function() {
-    var Y, models, conn, juju, app;
-
-
-    before(function(done) {
-      Y = YUI(GlobalConfig).use(
-          'juju-gui',
-          'datasource-local', 'json-stringify', 'juju-charm-store',
-          'datasource-io', 'io', 'array-extras', 'juju-charm-models',
-          'juju-tests-utils',
-          function(Y) {
-            juju = Y.namespace('juju');
-            done();
-          });
-    });
-
-    afterEach(function() {
-      app.destroy();
-      window.flags = {};
-    });
-
-    it('enables the charmworld v2 API if not set', function() {
-      assert.deepEqual(window.flags, {});
-      app = new Y.juju.App({});
-      assert.equal(app.get('store').name, 'APIv2');
-    });
-
-    it('enables the charmworld v3 API if set', function() {
-      window.flags.charmworldv3 = true;
-      app = new Y.juju.App({});
-      assert.equal(app.get('store').name, 'APIv3');
-    });
-
-  });
-
 })();

=== modified file 'test/test_environment_view.js'
--- test/test_environment_view.js	2013-10-24 20:48:42 +0000
+++ test/test_environment_view.js	2013-11-05 18:17:46 +0000
@@ -113,7 +113,7 @@
         env = juju.newEnvironment({conn: conn});
         env.connect();
         conn.open();
-        fakeStore = new Y.juju.charmworld.APIv2({});
+        fakeStore = new Y.juju.charmworld.APIv3({});
         fakeStore.iconpath = function() {
           return 'charm icon url';
         };
@@ -1207,7 +1207,7 @@
     });
 
     it('sets the default icon for local charms without an icon', function() {
-      var iconFakeStore = new Y.juju.charmworld.APIv2({
+      var iconFakeStore = new Y.juju.charmworld.APIv3({
         apiHost: 'http://localhost'
       });
       var services = new models.ServiceList();
@@ -1244,7 +1244,7 @@
       // The mysql charm has an icon from on the server.
       assert.equal(
           boxes['cs:mysql-1'].icon,
-          'http://localhost/api/2/charm/mysql-1/icon.svg'
+          'http://localhost/api/3/charm/mysql-1/file/icon.svg'
       );
     });
   });

=== modified file 'test/test_ghost_inspector.js'
--- test/test_ghost_inspector.js	2013-09-30 13:37:49 +0000
+++ test/test_ghost_inspector.js	2013-11-05 18:17:46 +0000
@@ -73,7 +73,7 @@
     // Create a ghost service with the fake charm.
     service = db.services.ghostService(charm);
 
-    var fakeStore = new Y.juju.charmworld.APIv2({});
+    var fakeStore = new Y.juju.charmworld.APIv3({});
     fakeStore.iconpath = function(id) {
       return '/icon/' + id;
     };

=== modified file 'test/test_inspector_charm.js'
--- test/test_inspector_charm.js	2013-10-02 17:46:16 +0000
+++ test/test_inspector_charm.js	2013-11-05 18:17:46 +0000
@@ -62,7 +62,7 @@
     testContainer = utils.makeContainer();
     testContainer.setHTML('<div class="left-breakout"></div>');
 
-    fakeStore = new Y.juju.charmworld.APIv2({});
+    fakeStore = new Y.juju.charmworld.APIv3({});
     fakeStore.set('datasource', {
       sendRequest: function(params) {
         // Stubbing the server callback value
@@ -101,7 +101,7 @@
     testContainer = utils.makeContainer();
     testContainer.setHTML('<div class="left-breakout"></div>');
 
-    fakeStore = new Y.juju.charmworld.APIv2({});
+    fakeStore = new Y.juju.charmworld.APIv3({});
     var cache = new Y.juju.models.CharmList();
     var charm = new Y.juju.models.Charm(data.charm);
     charm.set('cached', true);

=== modified file 'test/test_inspector_constraints.js'
--- test/test_inspector_constraints.js	2013-10-15 20:34:04 +0000
+++ test/test_inspector_constraints.js	2013-11-05 18:17:46 +0000
@@ -86,7 +86,7 @@
     var conn = new utils.SocketStub();
     var db = new models.Database();
     var service = makeService(db);
-    var fakeStore = new Y.juju.charmworld.APIv2({});
+    var fakeStore = new Y.juju.charmworld.APIv3({});
     fakeStore.iconpath = function() {
       return 'charm icon url';
     };

=== modified file 'test/test_inspector_overview.js'
--- test/test_inspector_overview.js	2013-11-05 03:23:33 +0000
+++ test/test_inspector_overview.js	2013-11-05 18:17:46 +0000
@@ -114,7 +114,7 @@
         {id: 'mediawiki/2', agent_state: 'pending',
           charmUrl: 'cs:precise/mediaWiki-14'}]
     ]}});
-    var fakeStore = new Y.juju.charmworld.APIv2({});
+    var fakeStore = new Y.juju.charmworld.APIv3({});
     fakeStore.iconpath = function(id) {
       return '/icon/' + id;
     };

=== modified file 'test/test_inspector_settings.js'
--- test/test_inspector_settings.js	2013-10-15 20:34:04 +0000
+++ test/test_inspector_settings.js	2013-11-05 18:17:46 +0000
@@ -92,7 +92,7 @@
         ['unit', 'add', {id: 'mediawiki/2', agent_state: 'pending'}]
       ]}});
     }
-    var fakeStore = new Y.juju.charmworld.APIv2({});
+    var fakeStore = new Y.juju.charmworld.APIv3({});
     fakeStore.iconpath = function() {
       return 'charm icon url';
     };

=== modified file 'test/test_model.js'
--- test/test_model.js	2013-11-01 23:04:50 +0000
+++ test/test_model.js	2013-11-05 18:17:46 +0000
@@ -450,7 +450,7 @@
       conn.open();
       container = Y.Node.create('<div id="test" class="container"></div>');
       data = [];
-      fakeStore = new Y.juju.charmworld.APIv2({});
+      fakeStore = new Y.juju.charmworld.APIv3({});
       fakeStore.set('datasource', {
         sendRequest: function(params) {
           params.callback.success({

=== modified file 'test/test_service_module.js'
--- test/test_service_module.js	2013-10-15 08:16:18 +0000
+++ test/test_service_module.js	2013-11-05 18:17:46 +0000
@@ -121,7 +121,7 @@
   });
 
   beforeEach(function() {
-    fakeStore = new Y.juju.charmworld.APIv2({});
+    fakeStore = new Y.juju.charmworld.APIv3({});
     fakeStore.iconpath = function() {
       return 'charm icon url';
     };

=== modified file 'test/utils.js'
--- test/utils.js	2013-11-01 23:04:50 +0000
+++ test/utils.js	2013-11-05 18:17:46 +0000
@@ -139,13 +139,8 @@
       return charms;
     })(),
 
-    makeFakeStore: function(version) {
-      var fakeStore;
-      if (version === 3) {
-        fakeStore = new Y.juju.charmworld.APIv3({});
-      } else {
-        fakeStore = new Y.juju.charmworld.APIv2({});
-      }
+    makeFakeStore: function() {
+      var fakeStore = new Y.juju.charmworld.APIv3({});
       fakeStore.charm = function(store_id, callbacks, bindscope, cache) {
         store_id = this.apiHelper.normalizeCharmId(store_id, 'precise');
         var charmName = store_id.split('/')[1];