Skip to content

Commit

Permalink
Merge pull request #216 from andreafalzetti/refactror/error-in-data-obj
Browse files Browse the repository at this point in the history
refactor: move error in data obj
  • Loading branch information
andreafalzetti authored Feb 18, 2020
2 parents 5045e9f + a7119e9 commit 9d7beac
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 208 deletions.
178 changes: 2 additions & 176 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,180 +1,6 @@
// For a detailed explanation regarding each configuration property, visit:
// https://jestjs.io/docs/en/configuration.html

module.exports = {
// All imported modules in your tests should be mocked automatically
// automock: false,

// Stop running tests after the first failure
// bail: false,

// Respect "browser" field in package.json when resolving modules
// browser: false,

// The directory where Jest should store its cached dependency information
// cacheDirectory: "/var/folders/qy/wggj91ln0cg677ghzt_rc9zwzvjxy5/T/jest_hoi8jp",

// Automatically clear mock calls and instances between every test
clearMocks: true,

// Indicates whether the coverage information should be collected while executing the test
// collectCoverage: false,

// An array of glob patterns indicating a set of files for which coverage information should be collected
// collectCoverageFrom: null,

// The directory where Jest should output its coverage files
coverageDirectory: 'coverage',

// An array of regexp pattern strings used to skip coverage collection
// coveragePathIgnorePatterns: [
// "/node_modules/"
// ],

// A list of reporter names that Jest uses when writing coverage reports
// coverageReporters: [
// "json",
// "text",
// "lcov",
// "clover"
// ],

// An object that configures minimum threshold enforcement for coverage results
// coverageThreshold: null,

// Make calling deprecated APIs throw helpful error messages
// errorOnDeprecated: false,

// Force coverage collection from ignored files usin a array of glob patterns
// forceCoverageMatch: [],

// A path to a module which exports an async function that is triggered once before all test suites
// globalSetup: null,

// A path to a module which exports an async function that is triggered once after all test suites
// globalTeardown: null,

// A set of global variables that need to be available in all test environments
// globals: {},

// An array of directory names to be searched recursively up from the requiring module's location
// moduleDirectories: [
// "node_modules"
// ],

// An array of file extensions your modules use
// moduleFileExtensions: [
// "js",
// "json",
// "jsx",
// "node"
// ],

// A map from regular expressions to module names that allow to stub out resources with a single module
// moduleNameMapper: {},

// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
// modulePathIgnorePatterns: [],

// Activates notifications for test results
// notify: false,

// An enum that specifies notification mode. Requires { notify: true }
// notifyMode: "always",

// A preset that is used as a base for Jest's configuration
// preset: null,

// Run tests from one or more projects
// projects: null,

// Use this configuration option to add custom reporters to Jest
// reporters: undefined,

// Automatically reset mock state between every test
// resetMocks: false,

// Reset the module registry before running each individual test
// resetModules: false,

// A path to a custom resolver
// resolver: null,

// Automatically restore mock state between every test
// restoreMocks: false,

// The root directory that Jest should scan for tests and modules within
// rootDir: null,

// A list of paths to directories that Jest should use to search for files in
// roots: [
// "<rootDir>"
// ],

// Allows you to use a custom runner instead of Jest's default test runner
// runner: "jest-runner",

// The paths to modules that run some code to configure or set up the testing environment before each test
// setupFiles: [],

// The path to a module that runs some code to configure or set up the testing framework before each test
// setupTestFrameworkScriptFile: null,

// A list of paths to snapshot serializer modules Jest should use for snapshot testing
// snapshotSerializers: [],

// The test environment that will be used for testing
testEnvironment: 'node'

// Options that will be passed to the testEnvironment
// testEnvironmentOptions: {},

// Adds a location field to test results
// testLocationInResults: false,

// The glob patterns Jest uses to detect test files
// testMatch: [
// "**/__tests__/**/*.js?(x)",
// "**/?(*.)+(spec|test).js?(x)"
// ],

// An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
// testPathIgnorePatterns: [
// "/node_modules/"
// ],

// The regexp pattern Jest uses to detect test files
// testRegex: "",

// This option allows the use of a custom results processor
// testResultsProcessor: null,

// This option allows use of a custom test runner
// testRunner: "jasmine2",

// This option sets the URL for the jsdom environment. It is reflected in properties such as location.href
// testURL: "http://localhost",

// Setting this value to "fake" allows the use of fake timers for functions such as "setTimeout"
// timers: "real",

// A map from regular expressions to paths to transformers
// transform: null,

// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
// transformIgnorePatterns: [
// "/node_modules/"
// ],

// An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
// unmockedModulePathPatterns: undefined,

// Indicates whether each individual test should be reported during the run
// verbose: null,

// An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
// watchPathIgnorePatterns: [],

// Whether to use watchman for file crawling
// watchman: true,
testEnvironment: 'node',
verbose: false
};
2 changes: 1 addition & 1 deletion lib/notification/notification.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const notification = config => async (data = {}, opts = {}) => {
success: false,
statusCode: res.statusCode,
error: 'Cannot fetch data',
...res.body
data: res.body
};
}

Expand Down
2 changes: 1 addition & 1 deletion lib/upload/upload.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const upload = config => async (data = {}, opts = {}) => {
return {
success: false,
statusCode: res.statusCode,
...res.body
data: res.body
};
}
return {
Expand Down
34 changes: 17 additions & 17 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"main": "lib/index.js",
"scripts": {
"test": "jest --coverage && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
"test:watch": "jest --watch",
"lint": "eslint . || (echo \"Some errors may be fixable with \\`npm run lint-fix\\`\". && exit 1)",
"lint:fix": "eslint . --fix",
"generate-doc": "documentation readme ./lib/index.js --section=API --shallow",
Expand All @@ -14,10 +15,10 @@
"author": "Andrea Falzetti <andrea@falzetti.me>",
"license": "MIT",
"dependencies": {
"form-urlencoded": "^4.1.0",
"joi": "^14.0.6",
"lodash.merge": "^4.6.1",
"needle": "^2.4.0"
"form-urlencoded": "^4.1.3",
"joi": "^14.3.1",
"lodash.merge": "^4.6.2",
"needle": "^2.3.2"
},
"devDependencies": {
"@semantic-release/changelog": "^3.0.4",
Expand Down
24 changes: 15 additions & 9 deletions test/upload.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,11 @@ describe('upload', () => {
expect(res).toEqual({
statusCode: 200,
success: false,
uploadFileName: null,
errorCode: '0900',
errorDescription: 'AccessToken non valorizzato, key : Authorization'
data: {
uploadFileName: null,
errorCode: '0900',
errorDescription: 'AccessToken non valorizzato, key : Authorization'
}
});
});

Expand All @@ -72,9 +74,11 @@ describe('upload', () => {
expect(res).toEqual({
statusCode: 200,
success: false,
uploadFileName: null,
errorCode: '0001',
errorDescription: 'Errore Generico'
data: {
uploadFileName: null,
errorCode: '0001',
errorDescription: 'Errore Generico'
}
});
});

Expand Down Expand Up @@ -149,9 +153,11 @@ describe('upload', () => {
expect(res).toEqual({
statusCode: 200,
success: false,
uploadFileName: null,
errorCode: '0012',
errorDescription: 'Errore autenticazione'
data: {
uploadFileName: null,
errorCode: '0012',
errorDescription: 'Errore autenticazione'
}
});
});

Expand Down

0 comments on commit 9d7beac

Please sign in to comment.