Merge lp:~diegosarmentero/click-update-manager/on-update-signal into lp:click-update-manager

Proposed by Diego Sarmentero on 2013-10-01
Status: Merged
Approved by: Diego Sarmentero on 2013-10-08
Approved revision: 38
Merged at revision: 34
Proposed branch: lp:~diegosarmentero/click-update-manager/on-update-signal
Merge into: lp:click-update-manager
Diff against target: 43 lines (+4/-4)
2 files modified
Components/PageUpdate.qml (+2/-2)
tests/unit/tst_pageupdate.qml (+2/-2)
To merge this branch: bzr merge lp:~diegosarmentero/click-update-manager/on-update-signal
Reviewer Review Type Date Requested Status
dobey (community) Approve on 2013-10-08
Alejandro J. Cura (community) Approve on 2013-10-08
PS Jenkins bot (community) continuous-integration Approve on 2013-10-08
Manuel de la Peña (community) 2013-10-01 Approve on 2013-10-07
Review via email: mp+188668@code.launchpad.net

Commit message

- change modelChanged for updateAvailableFound

To run the tests you need to have the last branch of lp:clickmanager-plugin installed

Description of the change

Use a special signal for updates found, so modelChanged can be used in cases were the model is cleared.

To post a comment you must log in.
35. By Diego Sarmentero on 2013-10-01

fixing tests

review: Approve
36. By Diego Sarmentero on 2013-10-07

trigger build

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
37. By Diego Sarmentero on 2013-10-07

[ Łukasz 'sil2100' Zemczak ]
* Add an -autopilot binary package for running integration tests,
  modify the tests themselves so that they work from a separate
  package.
[ Matthew Fischer ]
* Installing application icon - Switch package from "any" to "all".
[ Ubuntu daily release ]
* Automatic snapshot from revision 28
[ Diego Sarmentero ]
* Improve error handling using the new signals from the plugin.
* Adding retry button (BUG: #1232165). (LP: #1232165)
[ Rodney Dawes ]
* Add a rule to the makefile to run the unit tests. Run the unit tests
  during package build. Add autopkgtest configuration to test that
  dependency's changes don't break us.
[ Ubuntu daily release ]
* Automatic snapshot from revision 25
* Automatic snapshot from revision 21
[ Łukasz 'sil2100' Zemczak ]
* Build-dep on qtdeclarative5-ubuntu-click0.1 to force a dep-wait on
  powerpc.
[ Ubuntu daily release ]
* Automatic snapshot from revision 19
[ Łukasz 'sil2100' Zemczak ]
* Automatic snapshot from revision 16 (bootstrap)
[ Ubuntu daily release ]
* Automatic snapshot from revision 17

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
38. By Diego Sarmentero on 2013-10-08

[ Corey Goldberg ]
* autopilot test code cleanup.
[ Ubuntu daily release ]
* Automatic snapshot from revision 30

PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Alejandro J. Cura (alecu) wrote :

+1

review: Approve
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Components/PageUpdate.qml'
2--- Components/PageUpdate.qml 2013-10-04 12:18:26 +0000
3+++ Components/PageUpdate.qml 2013-10-08 12:43:00 +0000
4@@ -39,7 +39,7 @@
5
6 Component.onCompleted: clickManager.checkUpdates()
7
8- onModelChanged: {
9+ onUpdateAvailableFound: {
10 labelMessage.visible = false;
11 root.updates = clickManager.model.length;
12 loadingIndicator.visible = false;
13@@ -77,7 +77,7 @@
14 color: UbuntuColors.orange
15 onClicked: {
16 loadingIndicator.visible = true;
17- clickManager.checkUpdates()
18+ clickManager.checkUpdates();
19 }
20 }
21
22
23=== modified file 'tests/unit/tst_pageupdate.qml'
24--- tests/unit/tst_pageupdate.qml 2013-10-04 12:26:16 +0000
25+++ tests/unit/tst_pageupdate.qml 2013-10-08 12:43:00 +0000
26@@ -93,7 +93,7 @@
27 function test_model_1_item() {
28 var updatelist = UT.findChild(pageUpdate, "updateList");
29 var clickManager = UT.findChild(pageUpdate, "clickManager");
30- clickManager.modelChanged();
31+ clickManager.updateAvailableFound();
32 updatelist.model = [modelItem1];
33 pageUpdate.updates = 1;
34 var retryButton = UT.findChild(pageUpdate, "retryButton");
35@@ -107,7 +107,7 @@
36 function test_model_n_items() {
37 var updatelist = UT.findChild(pageUpdate, "updateList");
38 var clickManager = UT.findChild(pageUpdate, "clickManager");
39- clickManager.modelChanged();
40+ clickManager.updateAvailableFound();
41 updatelist.model = fakeModel;
42 pageUpdate.updates = 3;
43 var retryButton = UT.findChild(pageUpdate, "retryButton");

Subscribers

People subscribed via source and target branches