Refactor index.js to have testable functions #2854

New0 · 2018-12-13T13:05:59Z

No description provided.

First export, the onRequest const will be cut into smaller pieces finally have response handlers seperate functions

Cut to minimum peces, then will add the callbacks needed to test return values

Shelob9 · 2018-12-18T15:15:13Z

Merge #2823 into this branch, so that we can move forward with this, and fix error described here: #2823 (comment) before merging to develop

…2818

…dex.js #2818

- Made hashAndUpload testable - Added a processFiles function to expect a result based on the files array

…ploads

…passed to processFiles

Created processFileField function

Shelob9 · 2019-01-07T16:51:56Z

package.json

@@ -53,6 +53,7 @@
    "dangerously-set-inner-html": "^2.0.1",
    "exports-loader": "^0.7.0",
    "inputmask": "^3.3.11",
+    "jquery": "^3.3.1",


@New0 Make sure that jQuery is not being bundled (by webapack) should be handled here https://github.com/CalderaWP/Caldera-Forms/blob/master/webpack.config.js#L52)

Also, probably should use 1.12.4 since that's what WordPress uses.

Shelob9 · 2019-01-07T16:52:21Z

clients/render/fileUploads.js

+		if( response.hasOwnProperty('message') ){
+			messages[field.fieldIdAttr] = {
+				error: true,
+				message: response.hasOwnProperty('message') ? response.message : 'Invalid'


@New0 untranslatable string.

Shelob9 · 2019-01-07T16:52:30Z

clients/render/fileUploads.js

+	}
+};
+
+export const handleFileUploadError = (error, file) => {


@New0 Inline docs

…eing uploaded #2818

Shelob9 · 2019-01-07T16:53:25Z

clients/render/util.js

@@ -1,4 +1,4 @@
-const SparkMD5 = require('spark-md5');
+export const SparkMD5 = require('spark-md5');

 export const getFieldConfigBy = (fieldConfigs, findBy, findWhere) => {


@New0 Inline docs

Shelob9 · 2019-01-07T16:53:37Z

clients/render/util.js

@@ -1,4 +1,4 @@
-const SparkMD5 = require('spark-md5');
+export const SparkMD5 = require('spark-md5');


@New0 Why export the dependency?

… -> Values set to three files) that was previously failing

… (Test passes in phpstorm)

New0 · 2019-01-14T16:36:55Z

Ghost inspector test ( test site CF version set to branch 2818-2 ) https://app.ghostinspector.com/tests/5c3882b70b45715fbf380071

This reverts commit 2e521ed.

Shelob9 · 2019-01-15T16:17:30Z

@New0 What we said on the call, tests needed in addition to what you have:

1 field that allows multiple files - add file, add file, remove file, add file, submit, assert all 3 files uploaded
1 field that allows single file - add file, remove file, add file, submit, assert all 1 file uploaded
1 field that can be hidden by conditional logic - add file, hide field, submit, assert no files uploaded
1 field that can be hidden by conditional logic - add file, hide field, unhide submit, assert 1 files uploaded

For the second 2, enzyme could test that the state does not include the file field when field is not hidden -- I think we have this test, not sure.

After that I'll fo final review and MERGE IT 🌋 🌮 🎉 🍰 🌋

This reverts commit 0ef623e.

New0 added 3 commits December 13, 2018 14:04

Make the request event an exportable const in util.js

aa43a69

First export, the onRequest const will be cut into smaller pieces finally have response handlers seperate functions

WIP examples of tests needed, needs to be adjusted

2336b63

WIP work on request functions

3493dd3

Cut to minimum peces, then will add the callbacks needed to test return values

Shelob9 added the PR (Patch) Is a pull request label Dec 18, 2018

Shelob9 assigned New0 Dec 18, 2018

Shelob9 added this to the 1.8.0 milestone Dec 18, 2018

Josh Pollock and others added 17 commits December 18, 2018 10:25

revert most changes in last commit #2818

71eae95

add missing mock data file #2818

50b41e5

tests for cf2 util methods #2818

d2a0149

use new cf2 var util methods in render/index #2818

d6c0283

#2818 WIP tests for fileUpload callbacks

ea0129d

Work on tests for handleFileUploadResponse #2818

a35fd7e

Move fileUploads file to render folder instead of tests/render folder #…

22209de

…2818

Add fileUploads.js to render ( not attached to previous commit) #2818

2b969cf

Use handleFileUploadResponse(response,cf2,$form,messages,field) in in…

7dd89ba

…dex.js #2818

Document handleFileUploadResponse() #2818

98941d1

#2818 make createMediaFromFile testable

e3f25a3

#2818 make the Files process testable ( WIP needs more tests)

1dd8ce6

- Made hashAndUpload testable - Added a processFiles function to expect a result based on the files array

#2818 Document processFiles and hashAndUpload in clients/render/fileU…

3c6d195

…ploads

#2818 Test number of calls to hashAndUpload based on number of files …

43356a2

…passed to processFiles

Make files const passed to processFiles testable

4c88fa3

Created processFileField function

Update processFileField description #2818

f3bf87b

Setup jQuery for jest #2818

8f5569f

Shelob9 reviewed Jan 7, 2019

View reviewed changes

clients/render/fileUploads.js Outdated

}

};

export const handleFileUploadError = (error, file) => {

Copy link

Collaborator

Shelob9 Jan 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@New0 Inline docs

Failing test that shows the first issue that leads to only one File b…

07f1458

…eing uploaded #2818

Shelob9 reviewed Jan 7, 2019

View reviewed changes

New0 added 16 commits January 7, 2019 18:59

Fix #2818 and pass test ( Test the files const passed to processFiles…

53dac75

… -> Values set to three files) that was previously failing

Remove export of spark-md5 from util

b9afc54

Shorten test data definitions

948415a

Adapt test to $form.submit

8a5cbcd

Document handleFileUploadError

abc98d0

Document lastFile argument in handleFileUploadResponse

0ae6b05

Add theComponent to processData before processFileField

0c27d43

Test different number of files as values passed to processFileField

295efaf

Make translatable strings for text

eac943b

Set jQuery version to 1.12.4

b55eecf

Remove old skipped test ( moved this to fileUploads.test.js )

eda9b09

Add translations to mocked data

2b8aac3

Work on the Travis test that's failing for trunk version of WordPress…

15e294c

… (Test passes in phpstorm)

Restore test 'Test the files const passed to processFiles'

9aa9ebd

Define shouldBeValidating

be32296

Reordered tests in render/fileUpload

bae86a7

Shelob9 mentioned this pull request Jan 11, 2019

Merge master (1.7.5 and 1.7.6) to develop branch #2899

Merged

New0 added 6 commits January 15, 2019 08:43

Merge branch 'develop' into feature/2818-2

d979470

Update branch with develop

d89c1a2

Update vendor folder

2e521ed

Revert "Update vendor folder"

af17148

This reverts commit 2e521ed.

Update vendor

504d665

Update composer.lock

d8a9c79

Shelob9 mentioned this pull request Jan 15, 2019

#2904 add 'disabled' attribute for Checkbox, Dropdown, and Autocomplete field types #2905

Merged

New0 merged commit 0ef623e into develop Jan 15, 2019

New0 added a commit that referenced this pull request Jan 15, 2019

Revert "Refactor index.js to have testable functions (#2854)"

0fa5d7e

This reverts commit 0ef623e.

This was referenced Jan 15, 2019

Revert "Refactor index.js to have testable functions" #2909

Closed

Refactore index.js to make File field process testable #2910

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor index.js to have testable functions #2854

Refactor index.js to have testable functions #2854

New0 commented Dec 13, 2018

Shelob9 commented Dec 18, 2018

Shelob9 Jan 7, 2019

Shelob9 Jan 7, 2019

Shelob9 Jan 7, 2019

Shelob9 Jan 7, 2019

Shelob9 Jan 7, 2019

New0 commented Jan 14, 2019

Shelob9 commented Jan 15, 2019

		@@ -1,4 +1,4 @@
		const SparkMD5 = require('spark-md5');
		export const SparkMD5 = require('spark-md5');

Refactor index.js to have testable functions #2854

Refactor index.js to have testable functions #2854

Conversation

New0 commented Dec 13, 2018

Shelob9 commented Dec 18, 2018

Shelob9 Jan 7, 2019

Choose a reason for hiding this comment

Shelob9 Jan 7, 2019

Choose a reason for hiding this comment

Shelob9 Jan 7, 2019

Choose a reason for hiding this comment

Shelob9 Jan 7, 2019

Choose a reason for hiding this comment

Shelob9 Jan 7, 2019

Choose a reason for hiding this comment

New0 commented Jan 14, 2019

Shelob9 commented Jan 15, 2019