Merge 7273ebd into 4627ea5

README.md

@@ -20,6 +20,7 @@
 - [Development](#development)
   - [Commit Messages](#commit-messages)
   - [Code Quality](#code-quality)
+  - [Testing](#testing)
   - [Available Scripts](#available-scripts)
 - [Special Thanks](#special-thanks)
 - [License](#license)
@@ -80,6 +81,12 @@ Keeping code quality as good is a hard job in normally. Therefore, we are using
 
 In short, run `npm run lint` command.
 
+## Testing
+
+Writing tests is boring but also necessary. If you want to write a test look at other tests and don't forget apply proxy over Travis because of ridvanaltun/eksi-sozluk#16. The proxy server running over my local environment therefore sometimes it is not reacable, test fails on Travis when my local environment is turned off or the proxy server is turned off.
+
+I accept PRs by myself anyway so running tests over Travis is not a problem for a contributor. You can run tests on your local anytime.
+
 ## Available Scripts
 
 ```bash

__tests__/agenda.test.js

@@ -1,6 +1,16 @@
 const { EksiSozluk } = require('../src/index')
+const HttpsProxyAgent = require('https-proxy-agent')
 
-const instance = new EksiSozluk()
+let httpClient = {};
+
+// use proxy over Travis
+if (process.env.TRAVIS) {
+  httpClient = {
+    httpsAgent: new HttpsProxyAgent(process.env.HTTP_PROXY)
+  }
+}
+
+const instance = new EksiSozluk({httpClient})
 
 describe('Agenda Test', () => {
   test('Getting Agenda', () => {

__tests__/debe.test.js

@@ -1,6 +1,16 @@
 const { EksiSozluk } = require('../src/index')
+const HttpsProxyAgent = require('https-proxy-agent')
 
-const instance = new EksiSozluk()
+let httpClient = {};
+
+// use proxy over Travis
+if (process.env.TRAVIS) {
+  httpClient = {
+    httpsAgent: new HttpsProxyAgent(process.env.HTTP_PROXY)
+  }
+}
+
+const instance = new EksiSozluk({httpClient})
 
 describe('Debe Test', () => {
   test('Getting Debe', () => {

__tests__/entries.test.js

@@ -1,6 +1,16 @@
 const { EksiSozluk } = require('../src/index')
+const HttpsProxyAgent = require('https-proxy-agent')
 
-const instance = new EksiSozluk()
+let httpClient = {};
+
+// use proxy over Travis
+if (process.env.TRAVIS) {
+  httpClient = {
+    httpsAgent: new HttpsProxyAgent(process.env.HTTP_PROXY)
+  }
+}
+
+const instance = new EksiSozluk({httpClient})
 
 describe('Entries Test', () => {
   test('Getting Entries', () => {

__tests__/entry.test.js

@@ -1,6 +1,16 @@
 const { EksiSozluk } = require('../src/index')
+const HttpsProxyAgent = require('https-proxy-agent')
 
-const instance = new EksiSozluk()
+let httpClient = {};
+
+// use proxy over Travis
+if (process.env.TRAVIS) {
+  httpClient = {
+    httpsAgent: new HttpsProxyAgent(process.env.HTTP_PROXY)
+  }
+}
+
+const instance = new EksiSozluk({httpClient})
 
 describe('Entry Test', () => {
   test('Getting Entry By Id', () => {

__tests__/questions.test.js

@@ -1,6 +1,16 @@
 const { EksiSozluk } = require('../src/index')
+const HttpsProxyAgent = require('https-proxy-agent')
 
-const instance = new EksiSozluk()
+let httpClient = {};
+
+// use proxy over Travis
+if (process.env.TRAVIS) {
+  httpClient = {
+    httpsAgent: new HttpsProxyAgent(process.env.HTTP_PROXY)
+  }
+}
+
+const instance = new EksiSozluk({httpClient})
 
 describe('Questions Test', () => {
   test('Getting Questions in Agenda', () => {

__tests__/tags.test.js

@@ -1,6 +1,16 @@
 const { EksiSozluk } = require('../src/index')
+const HttpsProxyAgent = require('https-proxy-agent')
 
-const instance = new EksiSozluk()
+let httpClient = {};
+
+// use proxy over Travis
+if (process.env.TRAVIS) {
+  httpClient = {
+    httpsAgent: new HttpsProxyAgent(process.env.HTTP_PROXY)
+  }
+}
+
+const instance = new EksiSozluk({httpClient})
 
 describe('Tags Test', () => {
   test('Getting Tags', () => {

__tests__/todayInHistory.test.js

@@ -1,6 +1,16 @@
 const { EksiSozluk } = require('../src/index')
+const HttpsProxyAgent = require('https-proxy-agent')
 
-const instance = new EksiSozluk()
+let httpClient = {};
+
+// use proxy over Travis
+if (process.env.TRAVIS) {
+  httpClient = {
+    httpsAgent: new HttpsProxyAgent(process.env.HTTP_PROXY)
+  }
+}
+
+const instance = new EksiSozluk({httpClient})
 
 describe('Today in History Test', () => {
   test('Getting Today in History', () => {

__tests__/user.test.js

@@ -1,6 +1,16 @@
 const { EksiSozluk } = require('../src/index')
+const HttpsProxyAgent = require('https-proxy-agent')
 
-const instance = new EksiSozluk()
+let httpClient = {};
+
+// use proxy over Travis
+if (process.env.TRAVIS) {
+  httpClient = {
+    httpsAgent: new HttpsProxyAgent(process.env.HTTP_PROXY)
+  }
+}
+
+const instance = new EksiSozluk({httpClient})
 
 describe('User Test', () => {
   test('Getting User', () => {

jest.config.js

@@ -3,5 +3,6 @@ module.exports = {
   roots: ['__tests__/'],
   // This line solves: Cross origin http://localhost forbidden
   // @see https://github.com/axios/axios/issues/1754
-  testEnvironment: 'node'
+  testEnvironment: 'node',
+  testTimeout: 10000 // default 5 secs, we are using 10 secs
 }

package.json

@@ -40,6 +40,7 @@
     "axios": "^0.21.1",
     "cheerio": "^1.0.0-rc.10",
     "form-data": "^4.0.0",
+    "https-proxy-agent": "^5.0.0",
     "moment": "^2.29.1",
     "object-assign-deep": "^0.4.0",
     "querystring": "^0.2.1",

src/EksiSozluk.js

@@ -35,7 +35,7 @@ class EksiSozluk extends EksiGuest {
     )
 
     // make http client ready
-    const httpClient = axios.create(_options.httpClient)
+    const httpClient = axios.create({..._options.httpClient, ...options.httpClient})
 
     super(httpClient)