lp:~hazmat/juju-gui/reliable-test

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:juju-gui/experimental

Juju GUI Hackers: Pending requested 2012-12-24

Diff: 1717 lines (+781/-641) (has conflicts)

15 files modified

app/app.js (+16/-5)
app/modules-debug.js (+6/-1)
app/templates/overview.handlebars (+1/-1)
app/views/charm-panel.js (+3/-2)
app/views/environment.js (+4/-7)
app/views/topology/mega.js (+6/-2)
app/views/topology/panzoom.js (+3/-2)
app/views/utils.js (+5/-2)
package.json (+4/-0)
test/index.html (+75/-10)
test/test_app.js (+44/-14)
test/test_app_hotkeys.js (+47/-45)
test/test_d3_components.js (+0/-1)
test/test_notifications.js (+469/-454)
test/test_notifier_widget.js (+98/-95)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

299. By Kapil Thangavelu on 2013-01-02

disable rollups in debug, yank yeti

298. By Kapil Thangavelu on 2012-12-24

more wackamole style crap

297. By Kapil Thangavelu on 2012-12-24

sigh.. more style junk

296. By Kapil Thangavelu on 2012-12-24

manual style fixes

295. By Kapil Thangavelu on 2012-12-24

automated style cleanups

294. By Kapil Thangavelu on 2012-12-24

make tests more reliable, testable in isolation, and work with firefox. also enable phantomjs (not fully functional, but runs several suites)

293. By Gary Poster on 2012-12-21

Various small cleanups

This branch has a little for everyone.

For Nicola, and for those with a masochistic enjoyment of Makefile churn, I addressed bug 1092199: "Makefile build target is misnamed." See the bug for rationale and for the plan, which I followed except that I used "build-shared" instead of "build-common" as the new name for the former "build" directory. This "build-shared" choice, like a couple of other choices in this branch, was fairly arbitrary. I'd rather not change it, but that's because of time and inertia. If I'd reread the bug before starting I probably would have used build-common. Fixes for this bug account for the vast majority of the Makefile changes. The two exceptions are the change to the JSFILES variable definition, and the removal of the skin asset Make dependencies for build-prod and build-devel. I'll explain those in a moment. This bug also accounts for many of the changes in bin/merge-files, and various other places where you see s/build/build-shared/.

Thanks to the diagnosis and discussion from Nicola, Francesco and Kapil, I addressed one of the remaining parts of bug 1083920, "Charm should serve the GUI assets over HTTPS". Francesco identified two insecure sources we were having trouble with when we served over HTTPS. One insecure connection was the charm store. Kapil is working on getting a cert for the charm store, so we can simply use HTTPS for our charm store URLs. The other insecure connection is that we were still relying on a number of files from the Yahoo CDN. In prod, we relied on the HTTP-only CDN for three Gallery files, and in debug (and devel) we relied on the CDN for many files in addition. I fixed the way we serve our files in devel, debug and prod, so that all YUI files are served locally. The main step for this was to get the gallery files stored locally. I could have done this many ways. One choice could have been to use the npm yui-gallery package, but it is quite old so I rejected it. I also could have gotten all the gallery files from git as part of the build process. That would have been fine, as would have other approaches, but I went for an explicit and simple approach: I downloaded the files we needed into app/assets/javascripts and told the debug modules file where to find them and told the minifier to include them. This also required some tweaks to the Makefile's JSFILES calculation, to exclude those files.

With help from Benji, I updated the reviewer documentation and the release documentation to reflect the current state of things. Hopefully those changes are self-explanatory, and if they are not, we should probably fix them so they are!

I removed some unnecessarily duplicated and ignored topology "requires" in the modules-debug.js file, as requested by a comment at the top of that file and as blessed by Ben.

More valuably, I seem to have fixed the errors we saw in ``make test-prod`` in Ben's recently landed branch. I believe it was because of the fake console missing a "debug" call. In any case, I was having trouble with prod, and now it is working for me, and the prod tests seem fine too.

I tweaked Benji's Makefile change that had switched back from linking to copying YUI files into the build directories. The old symlinks had put the skin file assets in the wrong place. When Benji fixed the assets, he didn't notice that the Makefile said that it depended on the wrong location of those files. This meant that every time you ran make, the Makefile would rerun the linking code, in the vain attempt to create those incorrectly-placed files. Rather than include all skin asset locations, I simply removed those two dependencies ("night" and "sam"). Now the Makefile is as quiet as desired on repeated runs of "make," "make prod," "make debug," and "make devel."

R=frankban
CC=
https://codereview.appspot.com/7005044

292. By Benjamin Saller on 2012-12-20

Panzoom Module

This branch breaks out the first module
from Mega into a more module unit. While this
module is small a number of changes occur to make
this happen. The framework underwent some improvemnts,
changes around interaction with App and view replacement
occured, event bindings had to be updated. A pattern for
cross module event firing was established.

In future modules, the topo/component fires the events and
modules are bubble targets.

R=gary.poster, hazmat
CC=
https://codereview.appspot.com/6971045

291. By Francesco Banconi on 2012-12-19

Back to unreleased.

290. By Francesco Banconi on 2012-12-19

New release commit: 0.1.1.