Skip to content

Commit ae15b50

Browse files
TitanLiTitanLi
authored
Merge pull request #19 from vincent850706/test/fixBug_translation
Confirm translation and Remove needless judgment
2 parents 0d3eda1 + ae1acc8 commit ae15b50

File tree

9 files changed

+37
-54
lines changed

9 files changed

+37
-54
lines changed

‎e2e/environment/users.js‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -58,38 +58,31 @@ const users = {
5858
},
5959
'abImg': {
6060
'name':'ab.png',
61-
// 'path': '/home/ubuntu/img/'
62-
'path': '/home/titan/img/'
61+
'path': '/home/ubuntu/img/'
6362
},
6463
'abcImg': {
6564
'name':'abc.png',
66-
// 'path': '/home/ubuntu/img/'
67-
'path': '/home/titan/img/'
65+
'path': '/home/ubuntu/img/'
6866
},
6967
'abdImg': {
7068
'name':'abd.png',
71-
// 'path': '/home/ubuntu/img/'
72-
'path': '/home/titan/img/'
69+
'path': '/home/ubuntu/img/'
7370
},
7471
'abd1Img': {
7572
'name':'abd1.png',
76-
// 'path': '/home/ubuntu/img/'
77-
'path': '/home/titan/img/'
73+
'path': '/home/ubuntu/img/'
7874
},
7975
'abd2Img': {
8076
'name':'abd2.png',
81-
// 'path': '/home/ubuntu/img/'
82-
'path': '/home/titan/img/'
77+
'path': '/home/ubuntu/img/'
8378
},
8479
'abd11Img': {
8580
'name':'abd11.png',
86-
// 'path': '/home/ubuntu/img/'
87-
'path': '/home/titan/img/'
81+
'path': '/home/ubuntu/img/'
8882
},
8983
'abd22Img': {
9084
'name':'abd22.png',
91-
// 'path': '/home/ubuntu/img/'
92-
'path': '/home/titan/img/'
85+
'path': '/home/ubuntu/img/'
9386
}
9487
},
9588
'chrome-win7': {

‎e2e/file/makeCopyLanguage.js‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ describe('File Replicate Translation', () => {
2727
});
2828

2929
//EN
30-
describe('When user into the upload file form and the list is not empty:', () => {
30+
describe('When user into the upload file form and the list is not empty :', () => {
3131
beforeEach(() => {
3232
browser.actions().doubleClick(bue.bucketList.first()).perform();
3333
fie.uploadBtn.click();
@@ -56,7 +56,7 @@ describe('File Replicate Translation', () => {
5656
});
5757
});
5858

59-
describe('When user click replicateFileBtn and check language', () => {
59+
describe('When user click replicateFileBtn and selects the English language :', () => {
6060
beforeEach(() => {
6161
browser.actions().doubleClick(bue.bucketList.first()).perform();
6262
nae.menuBtn.get(1).click();
@@ -74,7 +74,7 @@ describe('File Replicate Translation', () => {
7474
});
7575
});
7676

77-
describe('When user click replicateConfirmBtn and check toast', () => {
77+
describe('When user click replicateConfirmBtn and check toast and selects the English language :', () => {
7878
beforeEach(() => {
7979
browser.actions().doubleClick(bue.bucketList.first()).perform();
8080
nae.menuBtn.get(1).click();
@@ -88,7 +88,6 @@ describe('File Replicate Translation', () => {
8888
it('Should check toastMessage is success', () => {
8989
browser.ignoreSynchronization = true;
9090
browser.sleep(1000);
91-
expect(nae.toastMessage.isDisplayed()).toBe(true);
9291
expect(nae.toastMessage.getText()).toBe(translate('en','TOAST_REPLICATE_SUCCESSFULLY'));
9392
browser.ignoreSynchronization = false;
9493
});
@@ -113,7 +112,7 @@ describe('File Replicate Translation', () => {
113112
});
114113

115114
//TW
116-
describe('When user into the upload file form and the list is not empty:', () => {
115+
describe('When user into the upload file form and the list is not empty :', () => {
117116
beforeEach(() => {
118117
browser.actions().doubleClick(bue.bucketList.first()).perform();
119118
fie.uploadBtn.click();
@@ -142,7 +141,7 @@ describe('File Replicate Translation', () => {
142141
});
143142
});
144143

145-
describe('When user click replicateFileBtn and check language', () => {
144+
describe('When user click replicateFileBtn and selects the Traditional Chinese language :', () => {
146145
beforeEach(() => {
147146
browser.actions().doubleClick(bue.bucketList.first()).perform();
148147
nae.menuBtn.get(1).click();
@@ -160,7 +159,7 @@ describe('File Replicate Translation', () => {
160159
});
161160
});
162161

163-
describe('When user click replicateConfirmBtn and check toast', () => {
162+
describe('When user click replicateConfirmBtn and check toast and selects the Traditional Chinese language :', () => {
164163
beforeEach(() => {
165164
browser.actions().doubleClick(bue.bucketList.first()).perform();
166165
nae.menuBtn.get(1).click();
@@ -199,7 +198,7 @@ describe('File Replicate Translation', () => {
199198
});
200199

201200
//CN
202-
describe('When user into the upload file form and the list is not empty:', () => {
201+
describe('When user into the upload file form and the list is not empty :', () => {
203202
beforeEach(() => {
204203
browser.actions().doubleClick(bue.bucketList.first()).perform();
205204
fie.uploadBtn.click();
@@ -228,7 +227,7 @@ describe('File Replicate Translation', () => {
228227
});
229228
});
230229

231-
describe('When user click replicateFileBtn and check language', () => {
230+
describe('When user click replicateFileBtn and selects the Simplified Chinese language :', () => {
232231
beforeEach(() => {
233232
browser.actions().doubleClick(bue.bucketList.first()).perform();
234233
nae.menuBtn.get(1).click();
@@ -246,7 +245,7 @@ describe('File Replicate Translation', () => {
246245
});
247246
});
248247

249-
describe('When user click replicateConfirmBtn and check toast', () => {
248+
describe('When user click replicateConfirmBtn and check toast and selects the Simplified Chinese language :', () => {
250249
beforeEach(() => {
251250
browser.actions().doubleClick(bue.bucketList.first()).perform();
252251
nae.menuBtn.get(1).click();
@@ -260,7 +259,6 @@ describe('File Replicate Translation', () => {
260259
it('Should check toastMessage is success', () => {
261260
browser.ignoreSynchronization = true;
262261
browser.sleep(1000);
263-
expect(nae.toastMessage.isDisplayed()).toBe(true);
264262
expect(nae.toastMessage.getText()).toBe(translate('cn','TOAST_REPLICATE_SUCCESSFULLY'));
265263
browser.ignoreSynchronization = false;
266264
});

‎e2e/file/moveFile.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ describe('File Move',() => {
159159
it('Should cheak into the user list page and check sort situation', () => {
160160
browser.ignoreSynchronization = true;
161161
browser.sleep(1000);
162-
expect(nae.toastMessage.isDisplayed()).toBe(true);
163162
expect(nae.toastMessage.getText()).toMatch(languages('en','TOAST_MOVE_SUCCESSFULLY'));
164163
browser.sleep(3000);
165164
expect(mve.moveForm.isPresent()).toBe(false);
@@ -184,7 +183,6 @@ describe('File Move',() => {
184183
it('Should check toastMessage is failure', () => {
185184
browser.ignoreSynchronization = true;
186185
browser.sleep(1000);
187-
expect(nae.toastMessage.isDisplayed()).toBe(true);
188186
expect(nae.toastMessage.getText()).toMatch(languages('en','TOAST_MOVE_FAILURE'));
189187
browser.sleep(3000);
190188
expect(mve.moveForm.isPresent()).toBe(false);

‎e2e/file/moveFolder.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,11 @@ describe('Folder Move',() => {
9191
nae.moveFileBtn.click();
9292
browser.actions().doubleClick(mve.fileMoveList.first()).perform();
9393
mve.moveBtn.click();
94-
browser.ignoreSynchronization = true;
95-
browser.sleep(3000);
9694
});
9795

9896
it('Should check toastMessage successfully', () => {
97+
browser.ignoreSynchronization = true;
98+
browser.sleep(1000);
9999
expect(nae.toastMessage.getText()).toBe(translate('en','TOAST_MOVE_FOLDER_SUCCESSFULLY'));
100100
browser.sleep(3000);
101101
expect(mve.moveForm.isPresent()).toBe(false);

‎e2e/file/moveLanguages.js‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ describe('File Translation', () => {
5959
});
6060
});
6161

62-
describe('When user click moveFileBtn and check language :', () => {
62+
describe('When user click moveFileBtn and selects the English language :', () => {
6363
beforeEach(() => {
6464
browser.actions().doubleClick(bue.bucketList.first()).perform();
6565
nae.menuBtn.get(1).click();
@@ -82,7 +82,7 @@ describe('File Translation', () => {
8282
});
8383
});
8484

85-
describe('When user move file and check toast language successfully :', () => {
85+
describe('When user move file and check toast language successfully and selects the English language:', () => {
8686
beforeEach(() => {
8787
browser.actions().doubleClick(bue.bucketList.first()).perform();
8888
nae.menuBtn.get(1).click();
@@ -97,13 +97,12 @@ describe('File Translation', () => {
9797
it('Should check every elements using the right language', () => {
9898
browser.ignoreSynchronization = true;
9999
browser.sleep(1000);
100-
expect(nae.toastMessage.isDisplayed()).toBe(true);
101100
expect(nae.toastMessage.getText()).toMatch(translate('en','TOAST_MOVE_SUCCESSFULLY'));
102101
browser.ignoreSynchronization = false;
103102
});
104103
});
105104

106-
describe('When user move file and check toast language failure :', () => {
105+
describe('When user move file and check toast language failure and selects the English language:', () => {
107106
beforeEach(() => {
108107
browser.actions().doubleClick(bue.bucketList.first()).perform();
109108
nae.menuBtn.get(1).click();
@@ -121,7 +120,6 @@ describe('File Translation', () => {
121120
it('Should check every elements using the right language', () => {
122121
browser.ignoreSynchronization = true;
123122
browser.sleep(1000);
124-
expect(nae.toastMessage.isDisplayed()).toBe(true);
125123
expect(nae.toastMessage.getText()).toMatch(translate('en','TOAST_MOVE_FAILURE'));
126124
browser.ignoreSynchronization = false;
127125
});
@@ -162,7 +160,7 @@ describe('File Translation', () => {
162160
});
163161
});
164162

165-
describe('When user click moveBtn and check language :', () => {
163+
describe('When user click moveBtn and check language and selects the Traditional Chinese language:', () => {
166164
beforeEach(() => {
167165
browser.actions().doubleClick(bue.bucketList.first()).perform();
168166
nae.menuBtn.get(1).click();
@@ -185,7 +183,7 @@ describe('File Translation', () => {
185183
});
186184
});
187185

188-
describe('When user move file and check toast language successfully :', () => {
186+
describe('When user move file and check toast language successfully and selects the Traditional Chinese language:', () => {
189187
beforeEach(() => {
190188
browser.actions().doubleClick(bue.bucketList.first()).perform();
191189
nae.menuBtn.get(1).click();
@@ -200,13 +198,12 @@ describe('File Translation', () => {
200198
it('Should check every elements using the right language', () => {
201199
browser.ignoreSynchronization = true;
202200
browser.sleep(1000);
203-
expect(nae.toastMessage.isDisplayed()).toBe(true);
204201
expect(nae.toastMessage.getText()).toMatch(translate('tw','TOAST_MOVE_SUCCESSFULLY'));
205202
browser.ignoreSynchronization = false;
206203
});
207204
});
208205

209-
describe('When user move file and check toast language failure :', () => {
206+
describe('When user move file and check toast language failure and selects the Traditional Chinese language:', () => {
210207
beforeEach(() => {
211208
browser.actions().doubleClick(bue.bucketList.first()).perform();
212209
nae.menuBtn.get(1).click();
@@ -224,7 +221,6 @@ describe('File Translation', () => {
224221
it('Should check every elements using the right language', () => {
225222
browser.ignoreSynchronization = true;
226223
browser.sleep(1000);
227-
expect(nae.toastMessage.isDisplayed()).toBe(true);
228224
expect(nae.toastMessage.getText()).toMatch(translate('tw','TOAST_MOVE_FAILURE'));
229225
browser.ignoreSynchronization = false;
230226
});
@@ -265,7 +261,7 @@ describe('File Translation', () => {
265261
});
266262
});
267263

268-
describe('When user click moveBtn and check language :', () => {
264+
describe('When user click moveBtn and check language and selects the Simplified Chinese language:', () => {
269265
beforeEach(() => {
270266
browser.actions().doubleClick(bue.bucketList.first()).perform();
271267
nae.menuBtn.get(1).click();
@@ -288,7 +284,7 @@ describe('File Translation', () => {
288284
});
289285
});
290286

291-
describe('When user move file and check toast language successfully :', () => {
287+
describe('When user move file and check toast language successfully and selects the Simplified Chinese language:', () => {
292288
beforeEach(() => {
293289
browser.actions().doubleClick(bue.bucketList.first()).perform();
294290
nae.menuBtn.get(1).click();
@@ -303,13 +299,12 @@ describe('File Translation', () => {
303299
it('Should check every elements using the right language', () => {
304300
browser.ignoreSynchronization = true;
305301
browser.sleep(1000);
306-
expect(nae.toastMessage.isDisplayed()).toBe(true);
307302
expect(nae.toastMessage.getText()).toMatch(translate('cn','TOAST_MOVE_SUCCESSFULLY'));
308303
browser.ignoreSynchronization = false;
309304
});
310305
});
311306

312-
describe('When user move file and check toast language failure :', () => {
307+
describe('When user move file and check toast language failure and selects the Simplified Chinese language:', () => {
313308
beforeEach(() => {
314309
browser.actions().doubleClick(bue.bucketList.first()).perform();
315310
nae.menuBtn.get(1).click();
@@ -327,7 +322,6 @@ describe('File Translation', () => {
327322
it('Should check every elements using the right language', () => {
328323
browser.ignoreSynchronization = true;
329324
browser.sleep(1000);
330-
expect(nae.toastMessage.isDisplayed()).toBe(true);
331325
expect(nae.toastMessage.getText()).toMatch(translate('cn','TOAST_MOVE_FAILURE'));
332326
browser.ignoreSynchronization = false;
333327
});

‎e2e/languages/cn.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ const languages = {
140140
'MOVE_TITLE': '移动',
141141
'MOVE_DESCRIPTION': '选择移动的目的地资料夹',
142142
'MOVE_SELECTED_ITEMS': '已选择的物件',
143-
'MOVE_FOIDER': '我的文件夹',
143+
'MOVE_FOIDER': 'My Folders',
144144
'MOVE_CANCEL' : '取消',
145145
'MOVE_CONFIRM' : '移动',
146146
'TOAST_MOVE_SUCCESSFULLY': /^档案.*移动档案成功$/,
@@ -149,7 +149,7 @@ const languages = {
149149
'TOAST_MOVE_FOLDER_FAILURE': '档案移动档案失败，请再试一次!',
150150
//MAKE_COPY
151151
'UTILS_REPLICATE': '製作副本',
152-
'REPLICATE_DESCRIPTION': '您要将所选项目制作副本吗？',
152+
'REPLICATE_DESCRIPTION': '您要为您选择的物件製作一个副本吗?',
153153
'REPLICATE_CANCEL': '取消',
154154
'REPLICATE_CONFIRM': '确定',
155155
'TOAST_REPLICATE_SUCCESSFULLY': '製作副本成功!',
@@ -169,9 +169,9 @@ const languages = {
169169
'ACCOUNT_REMAIN' : '剩馀',
170170
'ACCOUNT_TAG_REMAIN' : '剩馀',
171171
'ACCOUNT_TAG_USED' : '已使用',
172-
'ACCOUNT_DISPLAY' : '显示GB',
172+
'ACCOUNT_DISPLAY' : '显示 GB',
173173
'ACCOUNT_CONFIRM' : '确定',
174-
'ACCOUNT_STORAGE' : 'STORAGE CAPACITY',
174+
'ACCOUNT_STORAGE' : '容量配額',
175175
'ACCOUNT_TWO' : 'TWO',
176176
}
177177

‎e2e/languages/en.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ const languages = {
184184
'ACCOUNT_TAG_USED' : 'Used',
185185
'ACCOUNT_DISPLAY' : 'Display GB',
186186
'ACCOUNT_CONFIRM' : 'CONFIRM',
187-
'ACCOUNT_STORAGE' : 'STORAGE CAPACITY',
187+
'ACCOUNT_STORAGE' : 'CPACITY STORAGE',
188188
'ACCOUNT_TWO' : 'TWO',
189189
}
190190

‎e2e/languages/tw.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ const languages = {
138138
'MOVE_TITLE': '移動',
139139
'MOVE_DESCRIPTION': '選擇移動的目的地資料夾',
140140
'MOVE_SELECTED_ITEMS': '已選擇的物件',
141-
'MOVE_FOIDER': '我的文件夾',
141+
'MOVE_FOIDER': 'My Folders',
142142
'MOVE_CANCEL' : '取消',
143143
'MOVE_CONFIRM' : '移動',
144144
'TOAST_MOVE_SUCCESSFULLY': /^檔案.*移動檔案成功$/,
@@ -147,7 +147,7 @@ const languages = {
147147
'TOAST_MOVE_FOLDER_FAILURE': '檔案移動檔案失敗，請再試一次!',
148148
//MAKE_COPY
149149
'UTILS_REPLICATE': '製作副本',
150-
'REPLICATE_DESCRIPTION': '您要將所選項目製作副本嗎？',
150+
'REPLICATE_DESCRIPTION': '您要為您選擇的物件製作一個副本嗎?',
151151
'REPLICATE_CANCEL': '取消',
152152
'REPLICATE_CONFIRM': '確定',
153153
'TOAST_REPLICATE_SUCCESSFULLY': '製作副本成功!',
@@ -167,9 +167,9 @@ const languages = {
167167
'ACCOUNT_REMAIN' : '剩餘',
168168
'ACCOUNT_TAG_REMAIN' : '剩餘',
169169
'ACCOUNT_TAG_USED' : '已使用',
170-
'ACCOUNT_DISPLAY' : '顯示GB',
170+
'ACCOUNT_DISPLAY' : '顯示 GB',
171171
'ACCOUNT_CONFIRM' : '確定',
172-
'ACCOUNT_STORAGE' : 'STORAGE CAPACITY',
172+
'ACCOUNT_STORAGE' : '容量配額',
173173
'ACCOUNT_TWO' : 'TWO',
174174

175175
// // AUTH

‎e2e/page.example.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ function pages () {
44
this.bucketListPage = 'http://127.0.0.1:3000/bucket';
55
this.accountListPage = 'http://127.0.0.1:3000/manager';
66

7-
this.myAccountPage = 'http://10.26.1.213:3000/user/storage';
7+
this.myAccountPage = 'http://127.0.0.1:3000/user/storage';
88
}
99

1010
module.exports = pages;

0 commit comments

Comments
 (0)