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

Branch merges

Propose for merging

No branches dependent on this one.

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

Juju GUI Hackers: Pending requested 2013-01-23

Diff: 374 lines (+92/-68)

6 files modified

app/store/env.js (+13/-10)
app/views/service.js (+2/-2)
app/views/topology/relation.js (+9/-14)
test/test_application_notifications.js (+24/-34)
test/test_env.js (+9/-6)
test/test_topology_relation.js (+35/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1103477: Add test for relation removal

High

Fix Released

Link a bug report

Related blueprints

347. By Benji York on 2013-01-24

give a parameter a better name

346. By Benji York on 2013-01-24

merge from trunk

345. By Benji York on 2013-01-23

checkpoint

344. By Benji York on 2013-01-23

checkpoint

343. By Benji York on 2013-01-23

checkpoint

342. By Benji York on 2013-01-23

checkpoint

341. By Benji York on 2013-01-23

merge from prerequisite branch, plus first cut at test

340. By Francesco Banconi on 2013-01-23

Fix error while removing relations.

When removing a relation sometimes an exception
is raised: "Uncaught TypeError: Cannot call method
'one' of null".
I was able to reproduce the bug following these steps:
1) click on a relation, the remove relation modal
   dialog appears;
2) open the GUI in another tab, and force a delta stream
   event (e.g. add/remove another relation,
   destroy a service...);
3) on delta, the relation nodes are redrawn on both tabs,
   so the element stored in the dialog no longer exists
   in the DOM;
4) on the first tab, click to confirm the relation removal,
   you'll see the error.
In this branch, the relation node is retrieved again in
removeRelation using its relation id. This way we ensure
the element actually exists in the DOM.

R=bac, benji
CC=
https://codereview.appspot.com/7199043

339. By Brad Crittenden on 2013-01-22

When adding a relation, the service menu is shown.

If adding a relation using the 'Build Relation' action from the service menu
on the originating service, the click on the target service produces two
events. The dragend event is handled properly and sets up the relation. Then
the click event calls serviceClick.

Attempts to use the stopPropagation, stopEvent, and preventDefault methods on
the d3.event did not produce the desired results.

This work-around is pretty hacky but it does work. A more general solution
should be found.

Also, attempts to change the test 'must be able to add a relation from the
service menu' to simulate the click events and ensure the service menu was not
left displayed did not work.

This branch is submitted as is in an attempt to finish the last card blocking
the charm announcement.

R=bcsaller
CC=
https://codereview.appspot.com/7179049

338. By Gary Poster on 2013-01-22

Switch to newer, clearer favicon

favicon provided by Huw. Originals available in shared Google juju-gui/graphic resources folder, https://drive.google.com/a/canonical.com/?tab=co#folders/0B9C9etoysSQla1dWRFNWeWlBWHc

R=
CC=
https://codereview.appspot.com/7184045