Make the prod tests pass.

bin/merge-files

 #!/usr/bin/env node
 
 /*
  * We aggregate and minimize the JavaScript sources in order to improve the
  * load speed of the application.
  *
  * We don't want to use the YUI combo loader feature because we want to be able
  * to run from only static files and we want to be able to run behind a
  * firewall without access to the internet.
  *
@@ skipping 29 matching lines @@
   // are included in index.html separately as part of charm configuration,
   // and should not also be included in the minification.
   var paths = merge.readdir(syspath.join(process.cwd(), 'app'),
     [syspath.join(process.cwd(), 'app/assets'),
      syspath.join(process.cwd(), 'app/modules-debug.js'),
      syspath.join(process.cwd(), 'app/config.js'),
      syspath.join(process.cwd(), 'app/config-debug.js')]);
 
   // templates.js is a generated file. It is not part of the app directory.
   paths.push(syspath.join(process.cwd(), 'build/juju-ui/templates.js'));
+  paths.push(syspath.join(process.cwd(), 'app/models/charm.js'));

[gary.poster, 2012/12/14 21:18:37]

As we discussed, please either figure out why readdir is not finding charm.js,
or put an XXX and a bug, and we will come back to this.

[benji, 2012/12/14 21:43:32]

Done.

 
   merge.combineJs(paths, 'build/juju-ui/assets/app.js');
 
   // Get the paths to the YUI modules that we use.
   var reqs = merge.loadRequires(paths);
 
   // For some reason the loader does not get these requirements.
   // (Known issue #2)
   reqs.push('lang/datatype-date-format_en-US');
   reqs.push('parallel');
@@ skipping 13 matching lines @@
     'app/assets/javascripts/svg-layouts.js']);
 
   merge.combineJs(filesToLoad.js, 'build/juju-ui/assets/all-yui.js');
 
   var cssFiles = filesToLoad.css;
   cssFiles.push('app/assets/stylesheets/bootstrap-2.0.4.css');
   cssFiles.push('app/assets/stylesheets/bootstrap-responsive-2.0.4.css');
   merge.combineCSS(cssFiles,
     'build/juju-ui/assets/combined-css/all-static.css');
 });