Skip to content
This repository was archived by the owner on Jun 5, 2024. It is now read-only.

Commit 99428e6

Browse files
individual-itindividual-it
authored
Merge pull request #1101 from owncloud/replace-with-helper-funcs-p4
Replace provider states with helper functions (p4)
2 parents 8fbf77f + 7658267 commit 99428e6

10 files changed

+73
-98
lines changed

‎.drone.star

+1-1
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ def prepareTestConfig(subFolderPath = "/"):
231231
"commands": [
232232
"apt update",
233233
"apt install gettext -y",
234-
"envsubst < tests/config/config.drone.json > tests/config/config.json",
234+
"envsubst < tests/config/config.sample.json > tests/config/config.json",
235235
"cat tests/config/config.json",
236236
],
237237
"environment": {

‎tests/config/config.drone.json

-41
This file was deleted.

‎tests/fileVersionTest.js

+8-9
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ describe('Main: Currently testing file versions management,', function () {
2525
givenFileExists,
2626
givenUserExists,
2727
givenProviderBaseUrlIsReturned,
28-
givenFileVersionLinkIsReturned
28+
givenFileVersionLinkIsReturned,
29+
givenClientWaits
2930
} = require('./helpers/providerStateHelper')
3031

3132
const mockServerBaseUrl = getMockServerBaseUrl()
@@ -123,24 +124,22 @@ describe('Main: Currently testing file versions management,', function () {
123124
const PropfindFileVersionOfExistentFiles = async (provider) => {
124125
await givenUserExists(provider, testUser)
125126
await givenFileExists(provider, testUser, versionedFile)
126-
await provider
127-
.given('the client waits', { delay: 2000 })
127+
await givenClientWaits(provider, 2000)
128128
// re-upload the same file to create a new version
129129
await givenFileExists(
130130
provider,
131131
testUser,
132132
versionedFile,
133133
fileInfo.versions[0].content
134134
)
135-
await provider.given('the client waits', { delay: 2000 })
135+
await givenClientWaits(provider, 2000)
136136
await givenFileExists(
137137
provider,
138138
testUser,
139139
versionedFile,
140140
fileInfo.versions[1].content
141141
)
142-
await provider
143-
.given('the client waits', { delay: 2000 })
142+
await givenClientWaits(provider, 2000)
144143
await givenFileVersionLinkIsReturned(provider, testUser, versionedFile, 1)
145144
return provider
146145
.uponReceiving(`as '${testUser}', a PROPFIND request to get file versions of existent file`)
@@ -185,21 +184,21 @@ describe('Main: Currently testing file versions management,', function () {
185184
const getFileVersionContents = async (provider, i) => {
186185
await givenUserExists(provider, testUser)
187186
await givenFileExists(provider, testUser, versionedFile)
188-
await provider.given('the client waits', { delay: 2000 })
187+
await givenClientWaits(provider, 2000)
189188
await givenFileExists(
190189
provider,
191190
testUser,
192191
versionedFile,
193192
fileInfo.versions[0].content
194193
)
195-
await provider.given('the client waits', { delay: 2000 })
194+
await givenClientWaits(provider, 2000)
196195
await givenFileExists(
197196
provider,
198197
testUser,
199198
versionedFile,
200199
fileInfo.versions[1].content
201200
)
202-
await provider.given('the client waits', { delay: 2000 })
201+
await givenClientWaits(provider, 2000)
203202
await givenFileVersionLinkIsReturned(provider, testUser, versionedFile, i + 1)
204203
await provider
205204
.uponReceiving(`as '${testUser}', a GET request to get file version ${i} contents`)

‎tests/filesTest.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1277,7 +1277,7 @@ describe('Main: Currently testing files management,', function () {
12771277
)
12781278
await givenUserExists(provider, testUser)
12791279
await givenFileExists(provider, testUser, file)
1280-
await givenFileIsMarkedFavorite(provider, testUser, testUserPassword, file)
1280+
await givenFileIsMarkedFavorite(provider, testUser, file)
12811281
await provider
12821282
.uponReceiving(`as '${testUser}', a REPORT request to get favorite file`)
12831283
.withRequest({
@@ -1526,8 +1526,8 @@ describe('Main: Currently testing files management,', function () {
15261526

15271527
await givenUserExists(provider, testUser)
15281528
await givenFileExists(provider, testUser, testFile)
1529-
await givenSystemTagExists(provider, testUser, testUserPassword, newTagName)
1530-
await givenTagIsAssignedToFile(provider, testUser, testUserPassword, testFile, newTagName)
1529+
await givenSystemTagExists(provider, testUser, newTagName)
1530+
await givenTagIsAssignedToFile(provider, testUser, testFile, newTagName)
15311531
await provider
15321532
.uponReceiving(`as '${testUser}', a REPORT request to get files by tag`)
15331533
.withRequest({
@@ -1621,7 +1621,7 @@ describe('Main: Currently testing files management,', function () {
16211621

16221622
await givenUserExists(provider, testUser)
16231623
await givenFileExists(provider, testUser, testFile)
1624-
await givenSystemTagExists(provider, testUser, testUserPassword, newTagName)
1624+
await givenSystemTagExists(provider, testUser, newTagName)
16251625
await provider
16261626
.uponReceiving(`as '${testUser}', a PUT request to tag file`)
16271627
.withRequest({

‎tests/helpers/pactHelper.js

+8-4
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,8 @@ const getCapabilitiesWithInvalidAuthInteraction = function (provider, username =
378378
}
379379

380380
const createUserInteraction = function (provider) {
381-
provider.uponReceiving(`as '${adminUsername}', a POST request to create a user`)
381+
return provider
382+
.uponReceiving(`as '${adminUsername}', a POST request to create a user`)
382383
.withRequest({
383384
method: 'POST',
384385
path: MatchersV3.regex(
@@ -390,7 +391,8 @@ const createUserInteraction = function (provider) {
390391
...applicationFormUrlEncoded
391392
},
392393
body: `password=${testUserPassword}&userid=${testUser}`
393-
}).willRespondWith({
394+
})
395+
.willRespondWith({
394396
status: 200,
395397
headers: xmlResponseHeaders
396398
})
@@ -425,15 +427,17 @@ const createUserWithGroupMembershipInteraction = async function (provider) {
425427
}
426428

427429
const deleteUserInteraction = function (provider) {
428-
provider.uponReceiving(`as '${adminUsername}', a DELETE request to delete a user`)
430+
return provider
431+
.uponReceiving(`as '${adminUsername}', a DELETE request to delete a user`)
429432
.withRequest({
430433
method: 'DELETE',
431434
path: MatchersV3.regex(
432435
'.*\\/ocs\\/v1\\.php\\/cloud\\/users\\/' + testUser + '$',
433436
'/ocs/v1.php/cloud/users/' + testUser
434437
),
435438
headers: validAdminAuthHeaders
436-
}).willRespondWith({
439+
})
440+
.willRespondWith({
437441
status: 200,
438442
headers: xmlResponseHeaders,
439443

‎tests/helpers/providerStateHelper.js

+29-10
Original file line numberDiff line numberDiff line change
@@ -263,39 +263,36 @@ const givenResourceIsShared = async (
263263
*
264264
* @param {object} provider
265265
* @param {string} username
266-
* @param {string} password
267266
* @param {string} path
268267
*/
269-
const givenFileIsMarkedFavorite = (provider, username, password, path) => {
268+
const givenFileIsMarkedFavorite = (provider, username, path) => {
270269
return provider
271-
.given('file is marked as favorite', { username, password, path })
270+
.given('file is marked as favorite', { username, path })
272271
}
273272

274273
/**
275274
* creates a system tag
276275
*
277276
* @param {object} provider
278277
* @param {string} username
279-
* @param {string} password
280278
* @param {string} tag tag name
281279
*/
282-
const givenSystemTagExists = (provider, username, password, tag) => {
280+
const givenSystemTagExists = (provider, username, tag) => {
283281
return provider
284-
.given('a system tag is created', { username, password, tag })
282+
.given('a system tag is created', { username, tag })
285283
}
286284

287285
/**
288286
* assigns a tag to a file
289287
*
290288
* @param {object} provider
291289
* @param {string} username
292-
* @param {string} password
293290
* @param {string} fileName
294291
* @param {string} tagName
295292
*/
296-
const givenTagIsAssignedToFile = (provider, username, password, fileName, tagName) => {
293+
const givenTagIsAssignedToFile = (provider, username, fileName, tagName) => {
297294
return provider
298-
.given('a tag is assigned to a file', { username, password, fileName, tagName })
295+
.given('a tag is assigned to a file', { username, fileName, tagName })
299296
}
300297

301298
/**
@@ -375,6 +372,26 @@ const givenFileExistsInLastPublicShare = (
375372
})
376373
}
377374

375+
/**
376+
* @param {object} provider
377+
* @param {string} username
378+
* @param {string} path
379+
*/
380+
const givenSignedKeyIsReturned = (provider, username, path) => {
381+
return provider.given('signed-key is returned', {
382+
username,
383+
path
384+
})
385+
}
386+
387+
/**
388+
* @param {object} provider
389+
* @param {number} delay
390+
*/
391+
const givenClientWaits = (provider, delay) => {
392+
return provider.given('the client waits', { delay })
393+
}
394+
378395
module.exports = {
379396
givenUserExists,
380397
givenUserDoesNotExist,
@@ -396,5 +413,7 @@ module.exports = {
396413
givenUserIsMadeGroupSubadmin,
397414
givenUserIsAddedToGroup,
398415
givenFolderExistsInLastPublicShare,
399-
givenFileExistsInLastPublicShare
416+
givenFileExistsInLastPublicShare,
417+
givenSignedKeyIsReturned,
418+
givenClientWaits
400419
}

‎tests/helpers/sharingHelper.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,10 @@ const shareResource = function (username, shareParams) {
3030
* get shares of a file/folder
3131
*
3232
* @param {string} username
33-
* @param {string} userPassword
3433
* @param {string} path
3534
* @returns {*} result of the fetch request
3635
*/
37-
const getShareInfoByPath = function (username, userPassword, path) {
36+
const getShareInfoByPath = function (username, path) {
3837
return httpHelper.getOCS(
3938
`${sharesEndPoint}?path=${encodeURIPath(path)}`,
4039
null,
@@ -113,8 +112,8 @@ const toFormUrlEncoded = function (obj) {
113112
}
114113

115114
/**
116-
* @param {sring} resource
117-
* @param {sring} resourceType
115+
* @param {string} resource
116+
* @param {string} resourceType
118117
*
119118
* @returns {object} shareId and shareToken
120119
*/

‎tests/helpers/webdavHelper.js

+6-10
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ const listVersionsFolder = function (user, fileId) {
101101
return listResult.text()
102102
}
103103

104-
const getSignKey = function (username, password) {
104+
const getSignKey = function (username) {
105105
const response = httpHelper.getOCS(
106106
'/cloud/user/signing-key',
107107
null,
@@ -201,11 +201,10 @@ const getTrashBinElements = function (user, depth = '1') {
201201
/**
202202
* favorites a file
203203
* @param {string} username
204-
* @param {string} password
205204
* @param {string} fileName
206205
* @returns {*} result of the fetch request
207206
*/
208-
const markAsFavorite = function (username, password, fileName) {
207+
const markAsFavorite = function (username, fileName) {
209208
return httpHelper.proppatch(
210209
createDavPath(username, fileName),
211210
'<?xml version="1.0"?>' +
@@ -222,11 +221,10 @@ const markAsFavorite = function (username, password, fileName) {
222221
/**
223222
* creates a system tag
224223
* @param {string} username
225-
* @param {string} password
226224
* @param {string} tag tag name
227225
* @returns {*} result of the fetch request
228226
*/
229-
const createASystemTag = function (username, password, tag) {
227+
const createASystemTag = function (username, tag) {
230228
return httpHelper.post(
231229
'/systemtags',
232230
JSON.stringify({
@@ -244,14 +242,13 @@ const createASystemTag = function (username, password, tag) {
244242
/**
245243
* assigns a tag to a file
246244
* @param {string} username
247-
* @param {string} password
248245
* @param {string} fileName
249246
* @param {string} tagName
250247
* @returns {*} result of the fetch request
251248
*/
252-
const assignTagToFile = function (username, password, fileName, tagName) {
249+
const assignTagToFile = function (username, fileName, tagName) {
253250
const fileId = getFileId(username, fileName)
254-
const tagId = getTagId(username, password, tagName)
251+
const tagId = getTagId(username, tagName)
255252
return httpHelper.put(
256253
`/systemtags-relations/files/${fileId}/${tagId}`,
257254
null,
@@ -263,11 +260,10 @@ const assignTagToFile = function (username, password, fileName, tagName) {
263260
/**
264261
* gets tagid by tagName
265262
* @param {string} username
266-
* @param {string} password
267263
* @param {string} tagName
268264
* @returns {*} result of the fetch request
269265
*/
270-
const getTagId = function (username, password, tagName) {
266+
const getTagId = function (username, tagName) {
271267
const xmlReq = '<?xml version="1.0" encoding="utf-8" ?>' +
272268
'<a:propfind xmlns:a="DAV:" xmlns:oc="http://owncloud.org/ns">' +
273269
'<a:prop><oc:display-name/><oc:id/></a:prop></a:propfind>'

0 commit comments

Comments
 (0)