f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-04 21:12:41 +00:00
Code Wiki Activity

Merge branch 'master' into pr/2774

Browse Source
This commit is contained in:
Trevor Buckner
2023-04-07 13:15:41 -04:00
parent 83fac6a10f b5bd28ddd1
commit 99984e207f
8 changed files with 130 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/homebrew/navbar/error-navitem.jsx
View File

@@ -82,4 +82,4 @@ const ErrorNavItem = createClass({
} }
}); });
module.exports = ErrorNavItem; module.exports = ErrorNavItem;

144
client/homebrew/navbar/error-navitem.less
View File

@@ -1,77 +1,75 @@
.navItem { .navItem.error {
&.error { position : relative;
position : relative; background-color : @red;
background-color : @red; }
}
.errorContainer{ .errorContainer{
animation-name: glideDown; animation-name: glideDown;
animation-duration: 0.4s; animation-duration: 0.4s;
position : absolute; position : absolute;
top : 100%; top : 100%;
left : 50%; left : 50%;
z-index : 1000; z-index : 1000;
width : 140px; width : 140px;
padding : 3px; padding : 3px;
color : white; color : white;
background-color : #333;
border : 3px solid #444;
border-radius : 5px;
transform : translate(-50% + 3px, 10px);
text-align : center;
font-size : 10px;
font-weight : 800;
text-transform : uppercase;
a{
color : @teal;
}
&:before {
content: "";
width: 0px;
height: 0px;
position: absolute;
border-left: 10px solid transparent;
border-right: 10px solid transparent;
border-top: 10px solid transparent;
border-bottom: 10px solid #444;
left: 53px;
top: -23px;
}
&:after {
content: "";
width: 0px;
height: 0px;
position: absolute;
border-left: 10px solid transparent;
border-right: 10px solid transparent;
border-top: 10px solid transparent;
border-bottom: 10px solid #333;
left: 53px;
top: -19px;
}
.deny {
width : 48%;
margin : 1px;
padding : 5px;
background-color : #333; background-color : #333;
border : 3px solid #444; display : inline-block;
border-radius : 5px; border-left : 1px solid #666;
transform : translate(-50% + 3px, 10px); .animate(background-color);
text-align : center; &:hover{
font-size : 10px; background-color : red;
font-weight : 800;
text-transform : uppercase;
a{
color : @teal;
}
&:before {
content: "";
width: 0px;
height: 0px;
position: absolute;
border-left: 10px solid transparent;
border-right: 10px solid transparent;
border-top: 10px solid transparent;
border-bottom: 10px solid #444;
left: 53px;
top: -23px;
}
&:after {
content: "";
width: 0px;
height: 0px;
position: absolute;
border-left: 10px solid transparent;
border-right: 10px solid transparent;
border-top: 10px solid transparent;
border-bottom: 10px solid #333;
left: 53px;
top: -19px;
}
.deny {
width : 48%;
margin : 1px;
padding : 5px;
background-color : #333;
display : inline-block;
border-left : 1px solid #666;
.animate(background-color);
&:hover{
background-color : red;
}
}
.confirm {
width : 48%;
margin : 1px;
padding : 5px;
background-color : #333;
display : inline-block;
color : white;
.animate(background-color);
&:hover{
background-color : teal;
}
} }
} }
} .confirm {
width : 48%;
margin : 1px;
padding : 5px;
background-color : #333;
display : inline-block;
color : white;
.animate(background-color);
&:hover{
background-color : teal;
}
}
}

19
client/homebrew/pages/editPage/editPage.jsx
View File

@@ -254,6 +254,15 @@ const EditPage = createClass({
</div> </div>
</div> </div>
} }
{this.state.alertTrashedGoogleBrew &&
<div className='errorContainer' onClick={this.closeAlerts}>
This brew is currently in your Trash folder on Google Drive!<br />If you want to keep it, make sure to move it before it is deleted permanently!<br />
<div className='confirm'>
OK
</div>
</div>
}
</Nav.item>; </Nav.item>;
}, },
@@ -335,16 +344,6 @@ const EditPage = createClass({
const shareLink = this.processShareId(); const shareLink = this.processShareId();
return <Navbar> return <Navbar>
{this.state.alertTrashedGoogleBrew &&
<div className='errorContainer' onClick={this.closeAlerts}>
This brew is currently in your Trash folder on Google Drive!<br />If you want to keep it, make sure to move it before it is deleted permanently!<br />
<div className='confirm'>
OK
</div>
</div>
}
<Nav.section> <Nav.section>
<Nav.item className='brewTitle'>{this.state.brew.title}</Nav.item> <Nav.item className='brewTitle'>{this.state.brew.title}</Nav.item>
</Nav.section> </Nav.section>

61
package-lock.json generated
View File

@@ -36,7 +36,7 @@
"mongoose": "^7.0.3", "mongoose": "^7.0.3",
"nanoid": "3.3.4", "nanoid": "3.3.4",
"nconf": "^0.12.0", "nconf": "^0.12.0",
"npm": "^9.6.3", "npm": "^9.6.4",
"react": "^17.0.2", "react": "^17.0.2",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"react-frame-component": "5.2.6", "react-frame-component": "5.2.6",
@@ -49,7 +49,6 @@
"eslint": "^8.37.0", "eslint": "^8.37.0",
"eslint-plugin-react": "^7.32.2", "eslint-plugin-react": "^7.32.2",
"jest": "^29.5.0", "jest": "^29.5.0",
"jest-expect-message": "^1.1.3",
"supertest": "^6.3.3" "supertest": "^6.3.3"
}, },
"engines": { "engines": {
@@ -7490,12 +7489,6 @@
"node": "^14.15.0 || ^16.10.0 || >=18.0.0" "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
} }
}, },
"node_modules/jest-expect-message": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/jest-expect-message/-/jest-expect-message-1.1.3.tgz",
"integrity": "sha512-bTK77T4P+zto+XepAX3low8XVQxDgaEqh3jSTQOG8qvPpD69LsIdyJTa+RmnJh3HNSzJng62/44RPPc7OIlFxg==",
"dev": true
},
"node_modules/jest-get-type": { "node_modules/jest-get-type": {
"version": "29.4.3", "version": "29.4.3",
"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz", "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
@@ -9583,9 +9576,9 @@
} }
}, },
"node_modules/npm": { "node_modules/npm": {
"version": "9.6.3", "version": "9.6.4",
"resolved": "https://registry.npmjs.org/npm/-/npm-9.6.3.tgz", "resolved": "https://registry.npmjs.org/npm/-/npm-9.6.4.tgz",
"integrity": "sha512-KMAw6cJF5JGPJz/NtsU8H1sMqb34qPGnSMaSWrVO8bzxOdAXJNAtDXATvLl0lflrImIze1FZCqocM8wdIu3Sfg==", "integrity": "sha512-8/Mct0X/w77PmgIpSlXfNIOlrZBfT+8966zLCxOhwi1qZ2Ueyy99uWPSDW6bt2OKw1NzrvHJBSgkzAvn1iWuhw==",
"bundleDependencies": [ "bundleDependencies": [
"@isaacs/string-locale-compare", "@isaacs/string-locale-compare",
"@npmcli/arborist", "@npmcli/arborist",
@@ -9656,7 +9649,7 @@
], ],
"dependencies": { "dependencies": {
"@isaacs/string-locale-compare": "^1.1.0", "@isaacs/string-locale-compare": "^1.1.0",
"@npmcli/arborist": "^6.2.6", "@npmcli/arborist": "^6.2.7",
"@npmcli/config": "^6.1.5", "@npmcli/config": "^6.1.5",
"@npmcli/map-workspaces": "^3.0.3", "@npmcli/map-workspaces": "^3.0.3",
"@npmcli/package-json": "^3.0.0", "@npmcli/package-json": "^3.0.0",
@@ -9671,7 +9664,7 @@
"columnify": "^1.6.0", "columnify": "^1.6.0",
"fastest-levenshtein": "^1.0.16", "fastest-levenshtein": "^1.0.16",
"fs-minipass": "^3.0.1", "fs-minipass": "^3.0.1",
"glob": "^9.3.1", "glob": "^9.3.2",
"graceful-fs": "^4.2.11", "graceful-fs": "^4.2.11",
"hosted-git-info": "^6.1.1", "hosted-git-info": "^6.1.1",
"ini": "^3.0.1", "ini": "^3.0.1",
@@ -9679,12 +9672,12 @@
"is-cidr": "^4.0.2", "is-cidr": "^4.0.2",
"json-parse-even-better-errors": "^3.0.0", "json-parse-even-better-errors": "^3.0.0",
"libnpmaccess": "^7.0.2", "libnpmaccess": "^7.0.2",
"libnpmdiff": "^5.0.14", "libnpmdiff": "^5.0.15",
"libnpmexec": "^5.0.14", "libnpmexec": "^5.0.15",
"libnpmfund": "^4.0.14", "libnpmfund": "^4.0.15",
"libnpmhook": "^9.0.3", "libnpmhook": "^9.0.3",
"libnpmorg": "^5.0.3", "libnpmorg": "^5.0.3",
"libnpmpack": "^5.0.14", "libnpmpack": "^5.0.15",
"libnpmpublish": "^7.1.3", "libnpmpublish": "^7.1.3",
"libnpmsearch": "^6.0.2", "libnpmsearch": "^6.0.2",
"libnpmteam": "^5.0.3", "libnpmteam": "^5.0.3",
@@ -9713,7 +9706,7 @@
"read-package-json": "^6.0.1", "read-package-json": "^6.0.1",
"read-package-json-fast": "^3.0.2", "read-package-json-fast": "^3.0.2",
"semver": "^7.3.8", "semver": "^7.3.8",
"ssri": "^10.0.1", "ssri": "^10.0.2",
"tar": "^6.1.13", "tar": "^6.1.13",
"text-table": "~0.2.0", "text-table": "~0.2.0",
"tiny-relative-date": "^1.3.0", "tiny-relative-date": "^1.3.0",
@@ -9762,7 +9755,7 @@
"license": "ISC" "license": "ISC"
}, },
"node_modules/npm/node_modules/@npmcli/arborist": { "node_modules/npm/node_modules/@npmcli/arborist": {
"version": "6.2.6", "version": "6.2.7",
"inBundle": true, "inBundle": true,
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
@@ -9793,7 +9786,7 @@
"parse-conflict-json": "^3.0.0", "parse-conflict-json": "^3.0.0",
"proc-log": "^3.0.0", "proc-log": "^3.0.0",
"promise-all-reject-late": "^1.0.0", "promise-all-reject-late": "^1.0.0",
"promise-call-limit": "^1.0.1", "promise-call-limit": "^1.0.2",
"read-package-json-fast": "^3.0.2", "read-package-json-fast": "^3.0.2",
"semver": "^7.3.7", "semver": "^7.3.7",
"ssri": "^10.0.1", "ssri": "^10.0.1",
@@ -10521,7 +10514,7 @@
} }
}, },
"node_modules/npm/node_modules/glob": { "node_modules/npm/node_modules/glob": {
"version": "9.3.1", "version": "9.3.2",
"inBundle": true, "inBundle": true,
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
@@ -10795,7 +10788,7 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/npm/node_modules/just-diff": { "node_modules/npm/node_modules/just-diff": {
"version": "6.0.0", "version": "6.0.2",
"inBundle": true, "inBundle": true,
"license": "MIT" "license": "MIT"
}, },
@@ -10817,11 +10810,11 @@
} }
}, },
"node_modules/npm/node_modules/libnpmdiff": { "node_modules/npm/node_modules/libnpmdiff": {
"version": "5.0.14", "version": "5.0.15",
"inBundle": true, "inBundle": true,
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@npmcli/arborist": "^6.2.6", "@npmcli/arborist": "^6.2.7",
"@npmcli/disparity-colors": "^3.0.0", "@npmcli/disparity-colors": "^3.0.0",
"@npmcli/installed-package-contents": "^2.0.2", "@npmcli/installed-package-contents": "^2.0.2",
"binary-extensions": "^2.2.0", "binary-extensions": "^2.2.0",
@@ -10836,11 +10829,11 @@
} }
}, },
"node_modules/npm/node_modules/libnpmexec": { "node_modules/npm/node_modules/libnpmexec": {
"version": "5.0.14", "version": "5.0.15",
"inBundle": true, "inBundle": true,
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@npmcli/arborist": "^6.2.6", "@npmcli/arborist": "^6.2.7",
"@npmcli/run-script": "^6.0.0", "@npmcli/run-script": "^6.0.0",
"chalk": "^4.1.0", "chalk": "^4.1.0",
"ci-info": "^3.7.1", "ci-info": "^3.7.1",
@@ -10858,11 +10851,11 @@
} }
}, },
"node_modules/npm/node_modules/libnpmfund": { "node_modules/npm/node_modules/libnpmfund": {
"version": "4.0.14", "version": "4.0.15",
"inBundle": true, "inBundle": true,
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@npmcli/arborist": "^6.2.6" "@npmcli/arborist": "^6.2.7"
}, },
"engines": { "engines": {
"node": "^14.17.0 || ^16.13.0 || >=18.0.0" "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
@@ -10893,11 +10886,11 @@
} }
}, },
"node_modules/npm/node_modules/libnpmpack": { "node_modules/npm/node_modules/libnpmpack": {
"version": "5.0.14", "version": "5.0.15",
"inBundle": true, "inBundle": true,
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@npmcli/arborist": "^6.2.6", "@npmcli/arborist": "^6.2.7",
"@npmcli/run-script": "^6.0.0", "@npmcli/run-script": "^6.0.0",
"npm-package-arg": "^10.1.0", "npm-package-arg": "^10.1.0",
"pacote": "^15.0.8" "pacote": "^15.0.8"
@@ -11756,7 +11749,7 @@
} }
}, },
"node_modules/npm/node_modules/path-scurry": { "node_modules/npm/node_modules/path-scurry": {
"version": "1.6.1", "version": "1.6.3",
"inBundle": true, "inBundle": true,
"license": "BlueOak-1.0.0", "license": "BlueOak-1.0.0",
"dependencies": { "dependencies": {
@@ -11764,7 +11757,7 @@
"minipass": "^4.0.2" "minipass": "^4.0.2"
}, },
"engines": { "engines": {
"node": ">=14" "node": ">=16 || 14 >=14.17"
}, },
"funding": { "funding": {
"url": "https://github.com/sponsors/isaacs" "url": "https://github.com/sponsors/isaacs"
@@ -11807,7 +11800,7 @@
} }
}, },
"node_modules/npm/node_modules/promise-call-limit": { "node_modules/npm/node_modules/promise-call-limit": {
"version": "1.0.1", "version": "1.0.2",
"inBundle": true, "inBundle": true,
"license": "ISC", "license": "ISC",
"funding": { "funding": {
@@ -12095,7 +12088,7 @@
"license": "CC0-1.0" "license": "CC0-1.0"
}, },
"node_modules/npm/node_modules/ssri": { "node_modules/npm/node_modules/ssri": {
"version": "10.0.1", "version": "10.0.2",
"inBundle": true, "inBundle": true,
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {

2
package.json
View File

@@ -100,7 +100,7 @@
"mongoose": "^7.0.3", "mongoose": "^7.0.3",
"nanoid": "3.3.4", "nanoid": "3.3.4",
"nconf": "^0.12.0", "nconf": "^0.12.0",
"npm": "^9.6.3", "npm": "^9.6.4",
"react": "^17.0.2", "react": "^17.0.2",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"react-frame-component": "5.2.6", "react-frame-component": "5.2.6",

2
server/homebrew.api.js
View File

@@ -305,7 +305,7 @@ If you believe you should have access to this brew, ask the file owner to invite
if(brew.authors.length === 0) { if(brew.authors.length === 0) {
// Delete brew if there are no authors left // Delete brew if there are no authors left
await brew.remove() await HomebrewModel.deleteOne({ _id: brew._id })
.catch((err)=>{ .catch((err)=>{
console.error(err); console.error(err);
throw { status: 500, message: 'Error while removing' }; throw { status: 500, message: 'Error while removing' };

32
server/homebrew.api.spec.js
View File

@@ -10,7 +10,6 @@ describe('Tests for api', ()=>{
let modelBrew; let modelBrew;
let saveFunc; let saveFunc;
let removeFunc;
let markModifiedFunc; let markModifiedFunc;
let saved; let saved;
@@ -20,18 +19,15 @@ describe('Tests for api', ()=>{
saved = { ...this, _id: '1' }; saved = { ...this, _id: '1' };
return saved; return saved;
}); });
removeFunc = jest.fn(async function() {});
markModifiedFunc = jest.fn(()=>true); markModifiedFunc = jest.fn(()=>true);
modelBrew = (brew)=>({ modelBrew = (brew)=>({
...brew, ...brew,
save : saveFunc, save : saveFunc,
remove : removeFunc,
markModified : markModifiedFunc, markModified : markModifiedFunc,
toObject : function() { toObject : function() {
delete this.save; delete this.save;
delete this.toObject; delete this.toObject;
delete this.remove;
delete this.markModified; delete this.markModified;
return this; return this;
} }
@@ -569,13 +565,14 @@ brew`);
req.brew = brew; req.brew = brew;
}); });
model.findOne = jest.fn(async ()=>modelBrew(brew)); model.findOne = jest.fn(async ()=>modelBrew(brew));
model.deleteOne = jest.fn(async ()=>{});
const req = {}; const req = {};
await api.deleteBrew(req, res); await api.deleteBrew(req, res);
expect(api.getBrew).toHaveBeenCalled(); expect(api.getBrew).toHaveBeenCalled();
expect(model.findOne).toHaveBeenCalled(); expect(model.findOne).toHaveBeenCalled();
expect(removeFunc).toHaveBeenCalled(); expect(model.deleteOne).toHaveBeenCalled();
}); });
it('should throw on delete error', async ()=>{ it('should throw on delete error', async ()=>{
@@ -587,7 +584,7 @@ brew`);
req.brew = brew; req.brew = brew;
}); });
model.findOne = jest.fn(async ()=>modelBrew(brew)); model.findOne = jest.fn(async ()=>modelBrew(brew));
removeFunc = jest.fn(async ()=>{ throw 'err'; }); model.deleteOne = jest.fn(async ()=>{ throw 'err'; });
const req = {}; const req = {};
let err; let err;
@@ -600,7 +597,7 @@ brew`);
expect(err).not.toBeUndefined(); expect(err).not.toBeUndefined();
expect(api.getBrew).toHaveBeenCalled(); expect(api.getBrew).toHaveBeenCalled();
expect(model.findOne).toHaveBeenCalled(); expect(model.findOne).toHaveBeenCalled();
expect(removeFunc).toHaveBeenCalled(); expect(model.deleteOne).toHaveBeenCalled();
}); });
it('should delete when one author', async ()=>{ it('should delete when one author', async ()=>{
@@ -612,13 +609,14 @@ brew`);
req.brew = brew; req.brew = brew;
}); });
model.findOne = jest.fn(async ()=>modelBrew(brew)); model.findOne = jest.fn(async ()=>modelBrew(brew));
model.deleteOne = jest.fn(async ()=>{});
const req = { account: { username: 'test' } }; const req = { account: { username: 'test' } };
await api.deleteBrew(req, res); await api.deleteBrew(req, res);
expect(api.getBrew).toHaveBeenCalled(); expect(api.getBrew).toHaveBeenCalled();
expect(model.findOne).toHaveBeenCalled(); expect(model.findOne).toHaveBeenCalled();
expect(removeFunc).toHaveBeenCalled(); expect(model.deleteOne).toHaveBeenCalled();
}); });
it('should remove one author when multiple present', async ()=>{ it('should remove one author when multiple present', async ()=>{
@@ -630,6 +628,7 @@ brew`);
req.brew = brew; req.brew = brew;
}); });
model.findOne = jest.fn(async ()=>modelBrew(brew)); model.findOne = jest.fn(async ()=>modelBrew(brew));
model.deleteOne = jest.fn(async ()=>{});
const req = { account: { username: 'test' } }; const req = { account: { username: 'test' } };
await api.deleteBrew(req, res); await api.deleteBrew(req, res);
@@ -637,7 +636,7 @@ brew`);
expect(api.getBrew).toHaveBeenCalled(); expect(api.getBrew).toHaveBeenCalled();
expect(markModifiedFunc).toHaveBeenCalled(); expect(markModifiedFunc).toHaveBeenCalled();
expect(model.findOne).toHaveBeenCalled(); expect(model.findOne).toHaveBeenCalled();
expect(removeFunc).not.toHaveBeenCalled(); expect(model.deleteOne).not.toHaveBeenCalled();
expect(saveFunc).toHaveBeenCalled(); expect(saveFunc).toHaveBeenCalled();
expect(saved.authors).toEqual(['test2']); expect(saved.authors).toEqual(['test2']);
}); });
@@ -651,6 +650,7 @@ brew`);
req.brew = brew; req.brew = brew;
}); });
model.findOne = jest.fn(async ()=>modelBrew(brew)); model.findOne = jest.fn(async ()=>modelBrew(brew));
model.deleteOne = jest.fn(async ()=>{});
saveFunc = jest.fn(async ()=>{ throw 'err'; }); saveFunc = jest.fn(async ()=>{ throw 'err'; });
const req = { account: { username: 'test' } }; const req = { account: { username: 'test' } };
@@ -664,7 +664,7 @@ brew`);
expect(err).not.toBeUndefined(); expect(err).not.toBeUndefined();
expect(api.getBrew).toHaveBeenCalled(); expect(api.getBrew).toHaveBeenCalled();
expect(model.findOne).toHaveBeenCalled(); expect(model.findOne).toHaveBeenCalled();
expect(removeFunc).not.toHaveBeenCalled(); expect(model.deleteOne).not.toHaveBeenCalled();
expect(saveFunc).toHaveBeenCalled(); expect(saveFunc).toHaveBeenCalled();
}); });
@@ -677,6 +677,7 @@ brew`);
req.brew = brew; req.brew = brew;
}); });
model.findOne = jest.fn(async ()=>modelBrew(brew)); model.findOne = jest.fn(async ()=>modelBrew(brew));
model.deleteOne = jest.fn(async ()=>{});
api.deleteGoogleBrew = jest.fn(async ()=>true); api.deleteGoogleBrew = jest.fn(async ()=>true);
const req = { account: { username: 'test' } }; const req = { account: { username: 'test' } };
@@ -684,7 +685,7 @@ brew`);
expect(api.getBrew).toHaveBeenCalled(); expect(api.getBrew).toHaveBeenCalled();
expect(model.findOne).toHaveBeenCalled(); expect(model.findOne).toHaveBeenCalled();
expect(removeFunc).toHaveBeenCalled(); expect(model.deleteOne).toHaveBeenCalled();
expect(api.deleteGoogleBrew).toHaveBeenCalled(); expect(api.deleteGoogleBrew).toHaveBeenCalled();
}); });
@@ -697,6 +698,7 @@ brew`);
req.brew = brew; req.brew = brew;
}); });
model.findOne = jest.fn(async ()=>modelBrew(brew)); model.findOne = jest.fn(async ()=>modelBrew(brew));
model.deleteOne = jest.fn(async ()=>{});
api.deleteGoogleBrew = jest.fn(async ()=>{ api.deleteGoogleBrew = jest.fn(async ()=>{
throw 'err'; throw 'err';
}); });
@@ -706,7 +708,7 @@ brew`);
expect(api.getBrew).toHaveBeenCalled(); expect(api.getBrew).toHaveBeenCalled();
expect(model.findOne).toHaveBeenCalled(); expect(model.findOne).toHaveBeenCalled();
expect(removeFunc).toHaveBeenCalled(); expect(model.deleteOne).toHaveBeenCalled();
expect(api.deleteGoogleBrew).toHaveBeenCalled(); expect(api.deleteGoogleBrew).toHaveBeenCalled();
}); });
@@ -719,6 +721,7 @@ brew`);
req.brew = brew; req.brew = brew;
}); });
model.findOne = jest.fn(async ()=>modelBrew(brew)); model.findOne = jest.fn(async ()=>modelBrew(brew));
model.deleteOne = jest.fn(async ()=>{});
api.deleteGoogleBrew = jest.fn(async ()=>true); api.deleteGoogleBrew = jest.fn(async ()=>true);
const req = { account: { username: 'test' } }; const req = { account: { username: 'test' } };
@@ -727,7 +730,7 @@ brew`);
expect(api.getBrew).toHaveBeenCalled(); expect(api.getBrew).toHaveBeenCalled();
expect(markModifiedFunc).toHaveBeenCalled(); expect(markModifiedFunc).toHaveBeenCalled();
expect(model.findOne).toHaveBeenCalled(); expect(model.findOne).toHaveBeenCalled();
expect(removeFunc).not.toHaveBeenCalled(); expect(model.deleteOne).not.toHaveBeenCalled();
expect(api.deleteGoogleBrew).toHaveBeenCalled(); expect(api.deleteGoogleBrew).toHaveBeenCalled();
expect(saveFunc).toHaveBeenCalled(); expect(saveFunc).toHaveBeenCalled();
expect(saved.authors).toEqual(['test2']); expect(saved.authors).toEqual(['test2']);
@@ -745,6 +748,7 @@ brew`);
req.brew = brew; req.brew = brew;
}); });
model.findOne = jest.fn(async ()=>modelBrew(brew)); model.findOne = jest.fn(async ()=>modelBrew(brew));
model.deleteOne = jest.fn(async ()=>{});
api.deleteGoogleBrew = jest.fn(async ()=>true); api.deleteGoogleBrew = jest.fn(async ()=>true);
const req = { account: { username: 'test2' } }; const req = { account: { username: 'test2' } };
@@ -752,7 +756,7 @@ brew`);
expect(api.getBrew).toHaveBeenCalled(); expect(api.getBrew).toHaveBeenCalled();
expect(model.findOne).toHaveBeenCalled(); expect(model.findOne).toHaveBeenCalled();
expect(removeFunc).not.toHaveBeenCalled(); expect(model.deleteOne).not.toHaveBeenCalled();
expect(api.deleteGoogleBrew).not.toHaveBeenCalled(); expect(api.deleteGoogleBrew).not.toHaveBeenCalled();
expect(saveFunc).toHaveBeenCalled(); expect(saveFunc).toHaveBeenCalled();
expect(saved.authors).toEqual(['test']); expect(saved.authors).toEqual(['test']);

4
shared/naturalcrit/markdown.js
View File

@@ -134,7 +134,7 @@ const mustacheInjectInline = {
const match = inlineRegex.exec(src); const match = inlineRegex.exec(src);
if(match) { if(match) {
const lastToken = tokens[tokens.length - 1]; const lastToken = tokens[tokens.length - 1];
if(!lastToken) if(!lastToken || lastToken.type == 'mustacheInjectInline')
return false; return false;
const tags = ` ${processStyleTags(match[1])}`; const tags = ` ${processStyleTags(match[1])}`;
@@ -169,7 +169,7 @@ const mustacheInjectBlock = {
const match = inlineRegex.exec(src); const match = inlineRegex.exec(src);
if(match) { if(match) {
const lastToken = tokens[tokens.length - 1]; const lastToken = tokens[tokens.length - 1];
if(!lastToken) if(!lastToken || lastToken.type == 'mustacheInjectBlock')
return false; return false;
lastToken.originalType = 'mustacheInjectBlock'; lastToken.originalType = 'mustacheInjectBlock';