Skip to content
This repository was archived by the owner on May 22, 2021. It is now read-only.

Frontend tests #193

Merged
merged 18 commits into from
Jul 17, 2017
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
public/bundle.js
public/webcrypto-shim.js
test/frontend/bundle.js
2 changes: 1 addition & 1 deletion frontend/src/fileSender.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class FileSender extends EventEmitter {
url: responseObj.url,
fileId: responseObj.id,
secretKey: keydata.k,
deleteToken: responseObj.uuid
deleteToken: responseObj.delete
});
}
};
Expand Down
1 change: 0 additions & 1 deletion frontend/src/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ function arrayToHex(iv) {
hexStr += iv[i].toString(16);
}
}
window.hexStr = hexStr;
return hexStr;
}

Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"lint:js": "eslint .",
"start": "node server/server",
"test": "mocha test/unit && mocha test/server",
"test-browser": "watchify test/frontend/frontend.bundle.js -o test/frontend/bundle.js -d",
Copy link
Contributor

Choose a reason for hiding this comment

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

if "test/frontend/bundle.js" is compiled/browserified, we may want to add it to .gitignore and nuke the file below.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Ahh good idea. Did not mean to push that.

"version": "node scripts/version"
}
}
2 changes: 2 additions & 0 deletions test/frontend/.eslintrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
env:
browser: true
Loading