Skip to content

Commit

Permalink
Fixed issues reported by Codacy
Browse files Browse the repository at this point in the history 
Fixed issues reported by Codacy
  • Loading branch information
@anthonygauthier
anthonygauthier committed Mar 22, 2021
1 parent ed9ea41 commit 2f34ec3
Show file tree
Hide file tree
Showing 9 changed files with 211 additions and 212 deletions.
5 changes: 2 additions & 3 deletions dist/curlirize.js
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
'use strict';
"use strict";

Object.defineProperty(exports, "__esModule", {
value: true
});

var _CurlHelper = require('./lib/CurlHelper');
var _CurlHelper = require("./lib/CurlHelper");

function defaultLogCallback(curlResult, err) {
var command = curlResult.command;
Expand All @@ -31,7 +31,6 @@ exports.default = function (instance) {
};
} catch (err) {
// Even if the axios middleware is stopped, no error should occur outside.
console.log(err);
callback(null, err);
} finally {
if (req.curlirize !== false) {
Expand Down
2 changes: 1 addition & 1 deletion dist/lib/CurlHelper.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ var CurlHelper = exports.CurlHelper = function () {
value: function getBuiltURL() {
var url = this.getUrl();

if (this.getQueryString() != "") {
if (this.getQueryString() !== "") {
url = url.charAt(url.length - 1) == "/" ? url.substr(0, url.length - 1) : url;
url += this.getQueryString();
}
Expand Down
176 changes: 88 additions & 88 deletions dist/test/curlirize.test.js
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
'use strict';
"use strict";

var _expect = require('expect');
var _expect = require("expect");

var _expect2 = _interopRequireDefault(_expect);

var _axios = require('axios');
var _axios = require("axios");

var _axios2 = _interopRequireDefault(_axios);

var _curlirize = require('../curlirize');
var _curlirize = require("../curlirize");

var _curlirize2 = _interopRequireDefault(_curlirize);

var _CurlHelper = require('../lib/CurlHelper');
var _CurlHelper = require("../lib/CurlHelper");

var _devapp = require('./devapp');
var _devapp = require("./devapp");

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

(0, _curlirize2.default)(_axios2.default);

describe('Testing curlirize', function () {
it('should return a 200 with the value \'world\'', function (done) {
_axios2.default.post('http://localhost:7500/', { dummy: 'data' }).then(function (res) {
describe("Testing curlirize", function () {
it("should return a 200 with the value 'world'", function (done) {
_axios2.default.post("http://localhost:7500/", { dummy: "data" }).then(function (res) {
(0, _expect2.default)(res.status).toBe(200);
(0, _expect2.default)(res.data.hello).toBe('world');
(0, _expect2.default)(res.data.hello).toBe("world");
done();
}).catch(function (err) {
console.error(err);
});
});
it('should allow to remove curlirize part on a request', function (done) {
_axios2.default.post('http://localhost:7500/', { dummy: 'data' }).then(function (res) {
it("should allow to remove curlirize part on a request", function (done) {
_axios2.default.post("http://localhost:7500/", { dummy: "data" }).then(function (res) {
(0, _expect2.default)(res.status).toBe(200);
(0, _expect2.default)(res.data.hello).toBe('world');
(0, _expect2.default)(res.data.hello).toBe("world");
res.config.clearCurl();
(0, _expect2.default)(res.config.curlObject).not.toBeDefined();
(0, _expect2.default)(res.config.curlCommand).not.toBeDefined();
Expand All @@ -44,8 +44,8 @@ describe('Testing curlirize', function () {
});
});

it('should return a generated command with XML as data', function (done) {
_axios2.default.post('http://localhost:7500', "<myTestTag></myTestTag>").then(function (res) {
it("should return a generated command with XML as data", function (done) {
_axios2.default.post("http://localhost:7500", "<myTestTag></myTestTag>").then(function (res) {
(0, _expect2.default)(res.config.curlObject.getBody()).toBe("--data '<myTestTag></myTestTag>'");
(0, _expect2.default)(res.config.curlCommand).toContain("<myTestTag></myTestTag>");
done();
Expand All @@ -54,179 +54,179 @@ describe('Testing curlirize', function () {
});
});

it('should return the response with the defined curl command', function (done) {
_axios2.default.post('http://localhost:7500/', { dummy: 'data' }).then(function (res) {
it("should return the response with the defined curl command", function (done) {
_axios2.default.post("http://localhost:7500/", { dummy: "data" }).then(function (res) {
(0, _expect2.default)(res.config.curlCommand).toBeDefined();
(0, _expect2.default)(res.config.curlCommand).toBe('curl -X POST -H "Content-Type:application/x-www-form-urlencoded" --data \'{"dummy":"data"}\' "http://localhost:7500/"');
(0, _expect2.default)(res.config.curlCommand).toBe("curl -X POST -H \"Content-Type:application/x-www-form-urlencoded\" --data '{\"dummy\":\"data\"}' \"http://localhost:7500/\"");
done();
}).catch(function (err) {
console.error(err);
});
});

it('should return the generated command with no --data attribute', function (done) {
_axios2.default.post('http://localhost:7500/').then(function (res) {
it("should return the generated command with no --data attribute", function (done) {
_axios2.default.post("http://localhost:7500/").then(function (res) {
(0, _expect2.default)(res.config.curlCommand).toBeDefined();
(0, _expect2.default)(res.config.curlCommand).toBe('curl -X POST -H "Content-Type:application/x-www-form-urlencoded" "http://localhost:7500/"');
(0, _expect2.default)(res.config.curlCommand).toBe("curl -X POST -H \"Content-Type:application/x-www-form-urlencoded\" \"http://localhost:7500/\"");
done();
}).catch(function (err) {
console.error(err);
});
});

it('should return the generated command with headers specified on method call', function (done) {
_axios2.default.post('http://localhost:7500/', null, { headers: { Authorization: 'Bearer 123', testHeader: 'Testing' } }).then(function (res) {
it("should return the generated command with headers specified on method call", function (done) {
_axios2.default.post("http://localhost:7500/", null, { headers: { Authorization: "Bearer 123", testHeader: "Testing" } }).then(function (res) {
(0, _expect2.default)(res.config.curlCommand).toBeDefined();
(0, _expect2.default)(res.config.curlCommand).toBe('curl -X POST -H \"Content-Type:application/x-www-form-urlencoded\" -H \"Authorization:Bearer 123\" -H \"testHeader:Testing\" "http://localhost:7500/"');
(0, _expect2.default)(res.config.curlCommand).toBe("curl -X POST -H \"Content-Type:application/x-www-form-urlencoded\" -H \"Authorization:Bearer 123\" -H \"testHeader:Testing\" \"http://localhost:7500/\"");
done();
}).catch(function (err) {
console.error(err);
});
});

it('should return the generated command with a queryString specified in the URL', function (done) {
_axios2.default.post('http://localhost:7500/', null, { params: { test: 1 } }).then(function (res) {
it("should return the generated command with a queryString specified in the URL", function (done) {
_axios2.default.post("http://localhost:7500/", null, { params: { test: 1 } }).then(function (res) {
(0, _expect2.default)(res.config.curlCommand).toBeDefined();
(0, _expect2.default)(res.config.curlCommand).toBe('curl -X POST -H \"Content-Type:application/x-www-form-urlencoded\" "http://localhost:7500?test=1"');
(0, _expect2.default)(res.config.curlCommand).toBe("curl -X POST -H \"Content-Type:application/x-www-form-urlencoded\" \"http://localhost:7500?test=1\"");
done();
}).catch(function (err) {
console.error(err);
});
});
});

describe('Testing curl-helper module', function () {
describe("Testing curl-helper module", function () {
var fakeConfig = {
adapter: function adapter() {
return 'dummy';
return "dummy";
},
transformRequest: { '0': function _() {
return 'dummy';
transformRequest: { "0": function _() {
return "dummy";
} },
transformResponse: { '0': function _() {
return 'dummy';
transformResponse: { "0": function _() {
return "dummy";
} },
timeout: 0,
xsrfCookieName: 'XSRF-TOKEN',
xsrfHeaderName: 'X-XSRF-TOKEN',
xsrfCookieName: "XSRF-TOKEN",
xsrfHeaderName: "X-XSRF-TOKEN",
maxContentLength: -1,
validateStatus: function validateStatus() {
return 'dummy';
return "dummy";
},
headers: { Accept: 'application/json, text/plain, */*', 'Content-Type': 'application/json;charset=utf-8' },
method: 'post',
url: 'http://localhost:7500/',
data: { dummy: 'data' },
params: { testParam: 'test1', testParam_two: "test2" }
headers: { Accept: "application/json, text/plain, */*", "Content-Type": "application/json;charset=utf-8" },
method: "post",
url: "http://localhost:7500/",
data: { dummy: "data" },
params: { testParam: "test1", testParamTwo: "test2" }
};
var curl = new _CurlHelper.CurlHelper(fakeConfig);

it('should return an empty string if data is undefined', function (done) {
it("should return an empty string if data is undefined", function (done) {
var emptyConfig = {
adapter: function adapter() {
return 'dummy';
return "dummy";
},
transformRequest: { '0': function _() {
return 'dummy';
transformRequest: { "0": function _() {
return "dummy";
} },
transformResponse: { '0': function _() {
return 'dummy';
transformResponse: { "0": function _() {
return "dummy";
} },
timeout: 0,
xsrfCookieName: 'XSRF-TOKEN',
xsrfHeaderName: 'X-XSRF-TOKEN',
xsrfCookieName: "XSRF-TOKEN",
xsrfHeaderName: "X-XSRF-TOKEN",
maxContentLength: -1,
validateStatus: function validateStatus() {
return 'dummy';
return "dummy";
},
headers: { Accept: 'application/json, text/plain, */*', 'Content-Type': 'application/json;charset=utf-8' },
method: 'post',
url: 'http://localhost:7500/',
headers: { Accept: "application/json, text/plain, */*", "Content-Type": "application/json;charset=utf-8" },
method: "post",
url: "http://localhost:7500/",
data: undefined
};
var emptyDataCurl = new _CurlHelper.CurlHelper(emptyConfig);
(0, _expect2.default)(emptyDataCurl.getBody()).toBe('');
(0, _expect2.default)(emptyDataCurl.getBody()).toBe("");
done();
});

it('should return an empty string if data is == empty string', function (done) {
it("should return an empty string if data is == empty string", function (done) {
var emptyConfig = {
adapter: function adapter() {
return 'dummy';
return "dummy";
},
transformRequest: { '0': function _() {
return 'dummy';
transformRequest: { "0": function _() {
return "dummy";
} },
transformResponse: { '0': function _() {
return 'dummy';
transformResponse: { "0": function _() {
return "dummy";
} },
timeout: 0,
xsrfCookieName: 'XSRF-TOKEN',
xsrfHeaderName: 'X-XSRF-TOKEN',
xsrfCookieName: "XSRF-TOKEN",
xsrfHeaderName: "X-XSRF-TOKEN",
maxContentLength: -1,
validateStatus: function validateStatus() {
return 'dummy';
return "dummy";
},
headers: { Accept: 'application/json, text/plain, */*', 'Content-Type': 'application/json;charset=utf-8' },
method: 'post',
url: 'http://localhost:7500/',
data: ''
headers: { Accept: "application/json, text/plain, */*", "Content-Type": "application/json;charset=utf-8" },
method: "post",
url: "http://localhost:7500/",
data: ""
};
var emptyDataCurl = new _CurlHelper.CurlHelper(emptyConfig);
(0, _expect2.default)(emptyDataCurl.getBody()).toBe('');
done();
});

it('should return {} as --data if req data is == {}', function (done) {
it("should return {} as --data if req data is == {}", function (done) {
var emptyConfig = {
adapter: function adapter() {
return 'dummy';
return "dummy";
},
transformRequest: { '0': function _() {
return 'dummy';
transformRequest: { "0": function _() {
return "dummy";
} },
transformResponse: { '0': function _() {
return 'dummy';
transformResponse: { "0": function _() {
return "dummy";
} },
timeout: 0,
xsrfCookieName: 'XSRF-TOKEN',
xsrfHeaderName: 'X-XSRF-TOKEN',
xsrfCookieName: "XSRF-TOKEN",
xsrfHeaderName: "X-XSRF-TOKEN",
maxContentLength: -1,
validateStatus: function validateStatus() {
return 'dummy';
return "dummy";
},
headers: { Accept: 'application/json, text/plain, */*', 'Content-Type': 'application/json;charset=utf-8' },
method: 'post',
url: 'http://localhost:7500/',
headers: { Accept: "application/json, text/plain, */*", "Content-Type": "application/json;charset=utf-8" },
method: "post",
url: "http://localhost:7500/",
data: {}
};
var emptyDataCurl = new _CurlHelper.CurlHelper(emptyConfig);
(0, _expect2.default)(emptyDataCurl.getBody()).toBe("--data '{}'");
done();
});

it('should return a string with headers', function (done) {
(0, _expect2.default)(curl.getHeaders()).toBe('-H "Accept:application/json, text/plain, */*" -H "Content-Type:application/json;charset=utf-8"');
it("should return a string with headers", function (done) {
(0, _expect2.default)(curl.getHeaders()).toBe("-H \"Accept:application/json, text/plain, */*\" -H \"Content-Type:application/json;charset=utf-8\"");
done();
});

it('should return a string with HTTP method', function (done) {
(0, _expect2.default)(curl.getMethod()).toBe('-X POST');
it("should return a string with HTTP method", function (done) {
(0, _expect2.default)(curl.getMethod()).toBe("-X POST");
done();
});

it('should return a string with request body', function (done) {
(0, _expect2.default)(curl.getBody()).toBe('--data \'{"dummy":"data"}\'');
it("should return a string with request body", function (done) {
(0, _expect2.default)(curl.getBody()).toBe("--data '{\"dummy\":\"data\"}'");
done();
});

it('should return the URL of the request', function (done) {
it("should return the URL of the request", function (done) {
(0, _expect2.default)(curl.getUrl()).toBe("http://localhost:7500/");
done();
});

it('should return the queryString of the request', function (done) {
(0, _expect2.default)(curl.getQueryString()).toBe("?testParam=test1&testParam_two=test2");
it("should return the queryString of the request", function (done) {
(0, _expect2.default)(curl.getQueryString()).toBe("?testParam=test1&testParamTwo=test2");
done();
});
});
14 changes: 7 additions & 7 deletions dist/test/devapp.js
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
'use strict';
"use strict";

var _express = require('express');
var _express = require("express");

var _express2 = _interopRequireDefault(_express);

function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

var app = (0, _express2.default)();

app.get('/', function (req, res) {
res.send({ hello: 'world' });
app.get("/", function (req, res) {
res.send({ hello: "world" });
});

app.post('/', function (req, res) {
res.send({ hello: 'world' });
app.post("/", function (req, res) {
res.send({ hello: "world" });
});

app.listen(7500, function () {
console.info('Express dev server listening on port 7500');
console.info("Express dev server listening on port 7500");
});

module.exports.app;
4 changes: 2 additions & 2 deletions index.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const { default: CommonJS } = require('./dist/curlirize');
const { default: CommonJS } = require("./dist/curlirize");
module.exports =
typeof process === 'object' ? CommonJS : require('./src/curlirize');
typeof process === "object" ? CommonJS : require("./src/curlirize");
Loading

0 comments on commit 2f34ec3

Please sign in to comment.