lp:~benji/juju-gui/bug-1088507

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:juju-gui/experimental at revision 285

Juju GUI Hackers: Pending requested 2012-12-14

Diff: 925 lines (+433/-395)

7 files modified

Makefile (+19/-10)
app/app.js (+1/-0)
app/views/charm-panel.js (+32/-4)
bin/merge-files (+2/-0)
test/index.html (+5/-1)
test/test_charm_configuration.js (+20/-29)
test/test_model.js (+354/-351)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1088507: Tests should pass on the production build of the code

High

Fix Released

Link a bug report

Related blueprints

281. By Benji York on 2012-12-17

add some test tiles to the build directories

280. By Benji York on 2012-12-17

add comment suggested in review

279. By Benji York on 2012-12-14

add more commentary from reveis

278. By Benji York on 2012-12-14

Review change: remove the "test" target and have it tell the user to be explicit about what they want

277. By Benji York on 2012-12-14

Add comment

276. By Benji York on 2012-12-14

merge from trunk, resolving conflicts

275. By Benji York on 2012-12-14

fix prod tests and a bit more

274. By Madison Scott-Clary on 2012-12-10

Exclude config.js from minification

config(-debug).js should not be included in minification because it is already included in index.html, and needs to be modified in the charm start hook after the build process.

R=teknico
CC=
https://codereview.appspot.com/6905059

273. By Nicola Larosa on 2012-12-10

Make tests runnable in production.

Allow tests to run in the production environment, by executing
the "make test-prod" command. They currently fail, and will be
fixed in a future branch.

The branch also sorts the PHONY makefile targets in alphabetical order.

R=gary.poster, bac
CC=
https://codereview.appspot.com/6868092

272. By Benji York on 2012-12-10

Add the ability to make releases to the Makefile

The "dist" target creates a (gzipped) tar file which contains the entire
branch sans the ".bzr" and "release" directories.

This branch also introduces a CHANGES.yaml file. We are experementing with
YAML (instead of text or reST) to see if it has any advantages, especially in
the relm of displaying recent changes in the app itself.

There are two kinds of releases that can be made and they can be made to
either the "real" Launchpad site or to the staging site (for trial-runs).
Full details have been added to the procedures documentation.

R=teknico, benjamin.saller
CC=
https://codereview.appspot.com/6909046