snapweb

Merge lp:~stephen-stewart/snapweb/remove-not-uninstall into lp:~snappy-dev/snapweb/trunk

  1. remove-not-uninstall
  2. Merge into trunk
Proposed by Stephen Stewart on 2015-06-01
Status: Merged
Approved by: Sergio Schvezov on 2015-06-03
Approved revision: 156
Merged at revision: 154
Proposed branch: lp:~stephen-stewart/snapweb/remove-not-uninstall
Merge into: lp:~snappy-dev/snapweb/trunk
Diff against target: 202 lines (+30/-30)
6 files modified
www/src/css/installer.css (+1/-1)
www/src/js/behaviors/install.js (+6/-6)
www/src/js/config.js (+2/-2)
www/src/js/models/snap.js (+12/-12)
www/tests/modelSpec.js (+4/-4)
www/tests/snapLayoutViewSpec.js (+5/-5)
To merge this branch: bzr merge lp:~stephen-stewart/snapweb/remove-not-uninstall
Reviewer Review Type Date Requested Status
Sergio Schvezov 2015-06-01 Approve on 2015-06-03
Review via email: mp+260775@code.launchpad.net

Commit Message

use 'remove' not 'uninstall' to have parity with cli

To post a comment you must log in.
Sergio Schvezov (sergiusens) wrote :

feels better

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'www/src/css/installer.css'
2--- www/src/css/installer.css 2015-05-11 10:30:57 +0000
3+++ www/src/css/installer.css 2015-06-01 22:09:16 +0000
4@@ -28,7 +28,7 @@
5 white-space: nowrap;
6 }
7
8-.b-installer_do_uninstall .b-installer__button {
9+.b-installer_do_remove .b-installer__button {
10 background-color:#ccc;
11 color:#fff;
12 font-weight:300;
13
14=== modified file 'www/src/js/behaviors/install.js'
15--- www/src/js/behaviors/install.js 2015-05-08 14:53:07 +0000
16+++ www/src/js/behaviors/install.js 2015-06-01 22:09:16 +0000
17@@ -57,10 +57,10 @@
18 }
19
20 if (
21- state === CONF.INSTALL_STATE.UNINSTALLED &&
22- oldState === CONF.INSTALL_STATE.UNINSTALLING
23+ state === CONF.INSTALL_STATE.REMOVED &&
24+ oldState === CONF.INSTALL_STATE.REMOVING
25 ) {
26- this.ui.statusMessage.text('Uninstall successful!');
27+ this.ui.statusMessage.text('Snap removed!');
28 }
29 },
30
31@@ -84,15 +84,15 @@
32 }
33
34 if (status === CONF.INSTALL_STATE.INSTALLED) {
35- // uninstall
36+ // remove
37 model.set({
38- status: CONF.INSTALL_STATE.UNINSTALLING
39+ status: CONF.INSTALL_STATE.REMOVING
40 });
41 model.destroy({
42 dataType : 'json',
43 silent: true
44 });
45- } else if (status === CONF.INSTALL_STATE.UNINSTALLED) {
46+ } else if (status === CONF.INSTALL_STATE.REMOVED) {
47 // install
48 model.save({
49 status: CONF.INSTALL_STATE.INSTALLING
50
51=== modified file 'www/src/js/config.js'
52--- www/src/js/config.js 2015-05-07 22:19:29 +0000
53+++ www/src/js/config.js 2015-06-01 22:09:16 +0000
54@@ -15,8 +15,8 @@
55 INSTALL_STATE: {
56 INSTALLED: 'installed',
57 INSTALLING: 'installing',
58- UNINSTALLED: 'uninstalled',
59- UNINSTALLING: 'uninstalling'
60+ REMOVED: 'uninstalled',
61+ REMOVING: 'uninstalling'
62 },
63 INSTALL_POLL_WAIT: 16 // milliseconds
64 };
65
66=== modified file 'www/src/js/models/snap.js'
67--- www/src/js/models/snap.js 2015-05-26 21:07:02 +0000
68+++ www/src/js/models/snap.js 2015-06-01 22:09:16 +0000
69@@ -19,7 +19,7 @@
70 * });
71 *
72 * // install (http PUT)
73- * // uninstall (http DELETE)
74+ * // remove (http DELETE)
75 * // upgrade (http UPGRADE)
76 *
77 **/
78@@ -35,7 +35,7 @@
79
80 if (
81 status === CONF.INSTALL_STATE.INSTALLING ||
82- status === CONF.INSTALL_STATE.UNINSTALLING
83+ status === CONF.INSTALL_STATE.REMOVING
84 ) {
85 _.delay(function(model) {
86 model.fetch();
87@@ -97,20 +97,20 @@
88 var state = model.get('status');
89 var installHTMLClass = '';
90
91- if (state === CONF.INSTALL_STATE.UNINSTALLED) {
92+ if (state === CONF.INSTALL_STATE.REMOVED) {
93 installHTMLClass = 'b-installer_do_install';
94 }
95
96 if (state === CONF.INSTALL_STATE.INSTALLED) {
97- installHTMLClass = 'b-installer_do_uninstall';
98+ installHTMLClass = 'b-installer_do_remove';
99 }
100
101 if (state === CONF.INSTALL_STATE.INSTALLING) {
102 installHTMLClass = 'b-installer_do_install b-installer_thinking';
103 }
104
105- if (state === CONF.INSTALL_STATE.UNINSTALLING) {
106- installHTMLClass = 'b-installer_do_uninstall b-installer_thinking';
107+ if (state === CONF.INSTALL_STATE.REMOVING) {
108+ installHTMLClass = 'b-installer_do_remove b-installer_thinking';
109 }
110
111 return model.set('installHTMLClass', installHTMLClass);
112@@ -123,16 +123,16 @@
113
114 switch (state) {
115 case CONF.INSTALL_STATE.INSTALLED:
116- action = 'Uninstall';
117+ action = 'Remove';
118 break;
119 case CONF.INSTALL_STATE.INSTALLING:
120 action = 'Installing…';
121 break;
122- case CONF.INSTALL_STATE.UNINSTALLED:
123+ case CONF.INSTALL_STATE.REMOVED:
124 action = 'Install';
125 break;
126- case CONF.INSTALL_STATE.UNINSTALLING:
127- action = 'Uninstalling…';
128+ case CONF.INSTALL_STATE.REMOVING:
129+ action = 'Removing…';
130 break;
131 default:
132 // XXX
133@@ -152,11 +152,11 @@
134
135 if (
136 status === CONF.INSTALL_STATE.INSTALLED ||
137- status === CONF.INSTALL_STATE.UNINSTALLING
138+ status === CONF.INSTALL_STATE.REMOVING
139 ) {
140 response.isInstalled = true;
141 } else if (
142- status === CONF.INSTALL_STATE.UNINSTALLED ||
143+ status === CONF.INSTALL_STATE.REMOVED ||
144 status === CONF.INSTALL_STATE.INSTALLING
145 ) {
146 response.isInstalled = false;
147
148=== modified file 'www/tests/modelSpec.js'
149--- www/tests/modelSpec.js 2015-05-26 11:53:46 +0000
150+++ www/tests/modelSpec.js 2015-06-01 22:09:16 +0000
151@@ -43,13 +43,13 @@
152
153 it('should set installActionString from model state', function() {
154 this.model.set('status', CONF.INSTALL_STATE.INSTALLED);
155- expect(this.model.get('installActionString')).toBe('Uninstall');
156+ expect(this.model.get('installActionString')).toBe('Remove');
157
158- this.model.set('status', CONF.INSTALL_STATE.UNINSTALLED);
159+ this.model.set('status', CONF.INSTALL_STATE.REMOVED);
160 expect(this.model.get('installActionString')).toBe('Install');
161
162- this.model.set('status', CONF.INSTALL_STATE.UNINSTALLING);
163- expect(this.model.get('installActionString')).toBe('Uninstalling…');
164+ this.model.set('status', CONF.INSTALL_STATE.REMOVING);
165+ expect(this.model.get('installActionString')).toBe('Removing…');
166
167 this.model.set('status', CONF.INSTALL_STATE.INSTALLING);
168 expect(this.model.get('installActionString')).toBe('Installing…');
169
170=== modified file 'www/tests/snapLayoutViewSpec.js'
171--- www/tests/snapLayoutViewSpec.js 2015-05-12 11:34:22 +0000
172+++ www/tests/snapLayoutViewSpec.js 2015-06-01 22:09:16 +0000
173@@ -7,7 +7,7 @@
174
175 beforeEach(function() {
176 this.model = new Snap({
177- status: CONF.INSTALL_STATE.UNINSTALLED,
178+ status: CONF.INSTALL_STATE.REMOVED,
179 installActionString: 'Install'
180 });
181 this.view = new SnapLayoutView({
182@@ -34,8 +34,8 @@
183 expect(this.uiInstaller.hasClass('b-installer_thinking')).toBeTruthy();
184 });
185
186- it('should be thinking when uninstalling', function() {
187- this.model.set('status', CONF.INSTALL_STATE.UNINSTALLING);
188+ it('should be thinking when removing', function() {
189+ this.model.set('status', CONF.INSTALL_STATE.REMOVING);
190 expect(this.uiInstaller.hasClass('b-installer_thinking')).toBeTruthy();
191 });
192
193@@ -44,8 +44,8 @@
194 expect(this.uiInstaller.hasClass('b-installer_thinking')).toBeFalsy();
195 });
196
197- it('should not be thinking when uninstalled', function() {
198- this.model.set('status', CONF.INSTALL_STATE.UNINSTALLED);
199+ it('should not be thinking when removed', function() {
200+ this.model.set('status', CONF.INSTALL_STATE.REMOVED);
201 expect(this.uiInstaller.hasClass('b-installer_thinking')).toBeFalsy();
202 });
203

Subscribers

People subscribed via source and target branches