Adjust specs to work with new lib interface

test/specs/__helpers.js

@@ -47,49 +47,3 @@ getAjaxRequest = (function () {
 
   return getAjaxRequest
 })()
-
-// Validate an invalid character error
-validateInvalidCharacterError = function validateInvalidCharacterError (error) {
-  expect(/character/i.test(error.message)).toEqual(true)
-}
-
-// Setup basic auth tests
-setupBasicAuthTest = function setupBasicAuthTest () {
-  beforeEach(function () {
-    jasmine.Ajax.install()
-  })
-
-  afterEach(function () {
-    jasmine.Ajax.uninstall()
-  })
-
-  it('should accept HTTP Basic auth with username/password', function (done) {
-    axios('/foo', {
-      auth: {
-        username: 'Aladdin',
-        password: 'open sesame'
-      }
-    })
-
-    setTimeout(function () {
-      const request = jasmine.Ajax.requests.mostRecent()
-
-      expect(request.requestHeaders['Authorization']).toEqual('Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==')
-      done()
-    }, 100)
-  })
-
-  it('should fail to encode HTTP Basic auth credentials with non-Latin1 characters', function (done) {
-    axios('/foo', {
-      auth: {
-        username: 'Aladßç£☃din',
-        password: 'open sesame'
-      }
-    }).then(function (response) {
-      done(new Error('Should not succeed to make a HTTP Basic auth request with non-latin1 chars in credentials.'))
-    }).catch(function (error) {
-      validateInvalidCharacterError(error)
-      done()
-    })
-  })
-}

test/specs/adapter.spec.js

@@ -1,10 +1,10 @@
-const axios = require('../../index')
+import axios from '../../index'
 
 describe('adapter', function () {
   it('should support custom adapter', function (done) {
     let called = false
 
-    axios('/foo', {
+    axios.get('/foo', {
       adapter: function (config) {
         called = true
       }

test/specs/api.spec.js

@@ -1,3 +1,5 @@
+import axios from '../../index'
+
 describe('static api', function () {
   it('should have request method helpers', function () {
     expect(typeof axios.request).toEqual('function')
@@ -11,7 +13,7 @@ describe('static api', function () {
   })
 
   it('should have promise method helpers', function () {
-    const promise = axios()
+    const promise = axios.get()
 
     expect(typeof promise.then).toEqual('function')
     expect(typeof promise.catch).toEqual('function')

test/specs/basicAuth.spec.js

@@ -1,3 +1,49 @@
+import axios from '../../lib/axios'
+
+// Validate an invalid character error
+function validateInvalidCharacterError (error) {
+  expect(/character/i.test(error.message)).toEqual(true)
+}
+
 describe('basicAuth without btoa polyfill', function () {
-  setupBasicAuthTest()
+  beforeEach(function () {
+    jasmine.Ajax.install()
+  })
+
+  afterEach(function () {
+    jasmine.Ajax.uninstall()
+  })
+
+  it('should accept HTTP Basic auth with username/password', function (done) {
+    axios.get('/foo', {
+      auth: {
+        username: 'Alibaba',
+        password: 'open sesame'
+      }
+    })
+
+    setTimeout(function () {
+      const request = jasmine.Ajax.requests.mostRecent()
+
+      // Aladdin cannot open the sesame
+      expect(request.requestHeaders['Authorization']).not.toEqual('Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==')
+      // Alibaba can open the sesame
+      expect(request.requestHeaders['Authorization']).toEqual('Basic QWxpYmFiYTpvcGVuIHNlc2FtZQ==')
+      done()
+    }, 100)
+  })
+
+  it('should fail to encode HTTP Basic auth credentials with non-Latin1 characters', function (done) {
+    axios.get('/foo', {
+      auth: {
+        username: 'Aladßç£☃din',
+        password: 'open sesame'
+      }
+    }).then(function (response) {
+      done(new Error('Should not succeed to make a HTTP Basic auth request with non-latin1 chars in credentials.'))
+    }).catch(function (error) {
+      validateInvalidCharacterError(error)
+      done()
+    })
+  })
 })

test/specs/cancel.spec.js

@@ -1,5 +1,6 @@
-const Cancel = axios.Cancel
-const CancelToken = axios.CancelToken
+/* global getAjaxRequest */
+
+import axios, { Cancel, CancelToken } from '../../lib/axios'
 
 describe('cancel', function () {
   beforeEach(function () {

test/specs/cancel/Cancel.spec.js

@@ -1,4 +1,4 @@
-const Cancel = require('../../../lib/cancel/Cancel')
+import Cancel from '../../../lib/cancel/Cancel'
 
 describe('Cancel', function () {
   describe('toString', function () {

test/specs/cancel/CancelToken.spec.js

@@ -1,5 +1,5 @@
-const CancelToken = require('../../../lib/cancel/CancelToken')
-const Cancel = require('../../../lib/cancel/Cancel')
+import CancelToken from '../../../lib/cancel/CancelToken'
+import Cancel from '../../../lib/cancel/Cancel'
 
 describe('CancelToken', function () {
   describe('constructor', function () {

test/specs/cancel/isCancel.spec.js

@@ -1,5 +1,5 @@
-const isCancel = require('../../../lib/cancel/isCancel')
-const Cancel = require('../../../lib/cancel/Cancel')
+import isCancel from '../../../lib/cancel/isCancel'
+import Cancel from '../../../lib/cancel/Cancel'
 
 describe('isCancel', function () {
   it('returns true if value is a Cancel', function () {

test/specs/core/createError.spec.js

@@ -1,4 +1,4 @@
-const createError = require('../../../lib/core/createError')
+import createError from '../../../lib/core/createError'
 
 describe('core::createError', function () {
   it('should create an Error with message, config, code, request and response', function () {

test/specs/core/enhanceError.spec.js

@@ -1,4 +1,4 @@
-const enhanceError = require('../../../lib/core/enhanceError')
+import enhanceError from '../../../lib/core/enhanceError'
 
 describe('core::enhanceError', function () {
   it('should add config, config, request and response to error', function () {

test/specs/core/settle.spec.js

@@ -1,4 +1,4 @@
-const settle = require('../../../lib/core/settle')
+import settle from '../../../lib/core/settle'
 
 describe('core::settle', function () {
   let resolve

test/specs/core/transformData.spec.js

@@ -1,4 +1,4 @@
-const transformData = require('../../../lib/core/transformData')
+import transformData from '../../../lib/core/transformData'
 
 describe('core::transformData', function () {
   it('should support a single transformer', function () {

test/specs/defaults.spec.js

@@ -1,5 +1,8 @@
-const defaults = require('../../lib/defaults')
-const utils = require('../../lib/utils')
+/* global getAjaxRequest */
+
+import axios from '../../lib/axios'
+import defaults from '../../lib/defaults'
+import utils from '../../lib/utils'
 
 describe('defaults', function () {
   const XSRF_COOKIE_NAME = 'CUSTOM-XSRF-TOKEN'
@@ -36,7 +39,7 @@ describe('defaults', function () {
   })
 
   it('should use global defaults config', function (done) {
-    axios('/foo')
+    axios.get('/foo')
 
     getAjaxRequest().then(function (request) {
       expect(request.url).toBe('/foo')
@@ -47,7 +50,7 @@ describe('defaults', function () {
   it('should use modified defaults config', function (done) {
     axios.defaults.baseURL = 'http://example.com/'
 
-    axios('/foo')
+    axios.get('/foo')
 
     getAjaxRequest().then(function (request) {
       expect(request.url).toBe('http://example.com/foo')
@@ -56,7 +59,7 @@ describe('defaults', function () {
   })
 
   it('should use request config', function (done) {
-    axios('/foo', {
+    axios.get('/foo', {
       baseURL: 'http://www.example.com'
     })
 

test/specs/headers.spec.js

@@ -1,3 +1,6 @@
+/* global getAjaxRequest */
+import axios from '../../lib/axios'
+
 function testHeaderValue (headers, key, val) {
   let found = false
 
@@ -30,7 +33,7 @@ describe('headers', function () {
   it('should default common headers', function (done) {
     const headers = axios.defaults.headers.common
 
-    axios('/foo')
+    axios.get('/foo')
 
     getAjaxRequest().then(function (request) {
       for (const key in headers) {

test/specs/helpers/bind.spec.js

@@ -1,4 +1,4 @@
-const bind = require('../../../lib/helpers/bind')
+import bind from '../../../lib/helpers/bind'
 
 describe('bind', function () {
   it('should bind an object to a function', function () {

test/specs/helpers/btoa.spec.js

@@ -1,4 +1,4 @@
-const __btoa = require('../../../lib/helpers/btoa')
+import __btoa from '../../../lib/helpers/btoa'
 
 describe('btoa polyfill', function () {
   it('should behave the same as native window.btoa', function () {

test/specs/helpers/buildURL.spec.js

@@ -1,5 +1,6 @@
-const buildURL = require('../../../lib/helpers/buildURL')
-const URLSearchParams = require('url-search-params')
+/* global sinon */
+import buildURL from '../../../lib/helpers/buildURL'
+import * as URLSearchParams from 'url-search-params'
 
 describe('helpers::buildURL', function () {
   it('should support null params', function () {
@@ -55,8 +56,8 @@ describe('helpers::buildURL', function () {
   })
 
   it('should use serializer if provided', function () {
-    serializer = sinon.stub()
-    params = {foo: 'bar'}
+    const serializer = sinon.stub()
+    const params = {foo: 'bar'}
     serializer.returns('foo=bar')
     expect(buildURL('/foo', params, serializer)).toEqual('/foo?foo=bar')
     expect(serializer.calledOnce).toBe(true)

test/specs/helpers/combineURLs.spec.js

@@ -1,4 +1,4 @@
-const combineURLs = require('../../../lib/helpers/combineURLs')
+import combineURLs from '../../../lib/helpers/combineURLs'
 
 describe('helpers::combineURLs', function () {
   it('should combine URLs', function () {

test/specs/helpers/cookies.spec.js

@@ -1,4 +1,4 @@
-const cookies = require('../../../lib/helpers/cookies')
+import cookies from '../../../lib/helpers/cookies'
 
 describe('helpers::cookies', function () {
   afterEach(function () {

test/specs/helpers/isAbsoluteURL.spec.js

@@ -1,4 +1,4 @@
-const isAbsoluteURL = require('../../../lib/helpers/isAbsoluteURL')
+import isAbsoluteURL from '../../../lib/helpers/isAbsoluteURL'
 
 describe('helpers::isAbsoluteURL', function () {
   it('should return true if URL begins with valid scheme name', function () {

test/specs/helpers/isURLSameOrigin.spec.js

@@ -1,4 +1,4 @@
-const isURLSameOrigin = require('../../../lib/helpers/isURLSameOrigin')
+import isURLSameOrigin from '../../../lib/helpers/isURLSameOrigin'
 
 describe('helpers::isURLSameOrigin', function () {
   it('should detect same origin', function () {

test/specs/helpers/normalizeHeaderName.spec.js

@@ -1,4 +1,4 @@
-const normalizeHeaderName = require('../../../lib/helpers/normalizeHeaderName')
+import normalizeHeaderName from '../../../lib/helpers/normalizeHeaderName'
 
 describe('helpers::normalizeHeaderName', function () {
   it('should normalize matching header name', function () {

test/specs/helpers/parseHeaders.spec.js

@@ -1,4 +1,4 @@
-const parseHeaders = require('../../../lib/helpers/parseHeaders')
+import parseHeaders from '../../../lib/helpers/parseHeaders'
 
 describe('helpers::parseHeaders', function () {
   it('should parse headers', function () {

test/specs/helpers/spread.spec.js

@@ -1,4 +1,4 @@
-const spread = require('../../../lib/helpers/spread')
+import spread from '../../../lib/helpers/spread'
 
 describe('helpers::spread', function () {
   it('should spread array to arguments', function () {

test/specs/instance.spec.js

@@ -1,3 +1,7 @@
+/* global getAjaxRequest */
+
+import axios from '../../index'
+
 describe('instance', function () {
   beforeEach(function () {
     jasmine.Ajax.install()

test/specs/interceptors.spec.js

@@ -1,3 +1,7 @@
+/* global getAjaxRequest */
+
+import axios from '../../index'
+
 describe('interceptors', function () {
   beforeEach(function () {
     jasmine.Ajax.install()

test/specs/options.spec.js

@@ -1,3 +1,7 @@
+/* global getAjaxRequest */
+
+import axios from '../../index'
+
 describe('options', function () {
   beforeEach(function () {
     jasmine.Ajax.install()
@@ -8,7 +12,7 @@ describe('options', function () {
   })
 
   it('should default method to get', function (done) {
-    axios('/foo')
+    axios.get('/foo')
 
     getAjaxRequest().then(function (request) {
       expect(request.method).toBe('GET')
@@ -17,7 +21,7 @@ describe('options', function () {
   })
 
   it('should accept headers', function (done) {
-    axios('/foo', {
+    axios.get('/foo', {
       headers: {
         'X-Requested-With': 'XMLHttpRequest'
       }
@@ -30,7 +34,7 @@ describe('options', function () {
   })
 
   it('should accept params', function (done) {
-    axios('/foo', {
+    axios.get('/foo', {
       params: {
         foo: 123,
         bar: 456
@@ -44,7 +48,7 @@ describe('options', function () {
   })
 
   it('should allow overriding default headers', function (done) {
-    axios('/foo', {
+    axios.get('/foo', {
       headers: {
         'Accept': 'foo/bar'
       }