← Back to team overview

yellow team mailing list archive

[Merge] lp:~benji/juju-gui/bug-1088507 into lp:juju-gui

 

The proposal to merge lp:~benji/juju-gui/bug-1088507 into lp:juju-gui has been updated.

Description changed to:

Make the prod tests pass.

Changes a test that was failing because of some slight style difference to be
more direct.  Some slight style differences still exist between prod and dev.

The charm model module (app/models/charm.js) is now included in the combined
and minified JS file.

The event-simulate and node-event-simulate functions are needed for the tests,
so they are now directly loaded by test/index.html.

The test_charm_configuration.js file needs juju-charm-models but that module
was not specified.

test/test_model.js had to be rearranged so the YUI().use method was called
inside the "before" method instead of around the entire test module.  This
resulted in a mass reindenting.

Incidentally: Fixes the Makefile so YUI module assets are in the right place
so requests for them do not 404.

https://codereview.appspot.com/6947057/


For more details, see:
https://code.launchpad.net/~benji/juju-gui/bug-1088507/+merge/140020
-- 
https://code.launchpad.net/~benji/juju-gui/bug-1088507/+merge/140020
Your team Juju GUI Hackers is requested to review the proposed merge of lp:~benji/juju-gui/bug-1088507 into lp:juju-gui.


References