Skip to content

Commit

Permalink
test(*): fix breaking tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@thetutlage
thetutlage committed Aug 4, 2017
1 parent 23d4532 commit 6075848
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 15 deletions.
5 changes: 5 additions & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@
"test/**/*.spec.js"
]
},
"standard": {
"ignore": [
"templates"
]
},
"dependencies": {
"@adonisjs/generic-exceptions": "^1.0.0",
"basic-auth": "^1.1.0",
Expand Down
10 changes: 5 additions & 5 deletions test/functional/basic.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ test.group('Basic Auth', (group) => {

test('return error when credentials are not passed', async (assert) => {
this.server.on('request', (req, res) => {
const Context = ioc.use('Adonis/Src/Context')
const Context = ioc.use('Adonis/Src/HttpContext')

const ctx = new Context()
ctx.request = helpers.getRequest(req)
Expand Down Expand Up @@ -60,7 +60,7 @@ test.group('Basic Auth', (group) => {

test('return false when user doesn\'t exists', async (assert) => {
this.server.on('request', (req, res) => {
const Context = ioc.use('Adonis/Src/Context')
const Context = ioc.use('Adonis/Src/HttpContext')

const ctx = new Context()
ctx.request = helpers.getRequest(req)
Expand Down Expand Up @@ -97,7 +97,7 @@ test.group('Basic Auth', (group) => {
await ioc.use('App/Models/User').create({ email: 'foo@bar.com', password: 'secret' })

this.server.on('request', (req, res) => {
const Context = ioc.use('Adonis/Src/Context')
const Context = ioc.use('Adonis/Src/HttpContext')

const ctx = new Context()
ctx.request = helpers.getRequest(req)
Expand Down Expand Up @@ -135,7 +135,7 @@ test.group('Basic Auth', (group) => {
await ioc.use('App/Models/User').create({ email: 'foo@bar.com', password: 'secret' })

this.server.on('request', (req, res) => {
const Context = ioc.use('Adonis/Src/Context')
const Context = ioc.use('Adonis/Src/HttpContext')

const ctx = new Context()
ctx.request = helpers.getRequest(req)
Expand Down Expand Up @@ -175,7 +175,7 @@ test.group('Basic Auth', (group) => {
await ioc.use('App/Models/User').create({ email: 'foo@bar.com', password: 'secret' })

this.server.on('request', (req, res) => {
const Context = ioc.use('Adonis/Src/Context')
const Context = ioc.use('Adonis/Src/HttpContext')

const ctx = new Context()
ctx.request = helpers.getRequest(req)
Expand Down
18 changes: 9 additions & 9 deletions test/functional/sessions.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ test.group('Session', (group) => {

test('throw error when credentials are invalid', async (assert) => {
this.server.on('request', (req, res) => {
const Context = ioc.use('Adonis/Src/Context')
const Context = ioc.use('Adonis/Src/HttpContext')

const ctx = new Context()
ctx.request = helpers.getRequest(req)
Expand Down Expand Up @@ -60,7 +60,7 @@ test.group('Session', (group) => {
await ioc.use('App/Models/User').create({ email: 'foo@bar.com', password: 'secret' })

this.server.on('request', (req, res) => {
const Context = ioc.use('Adonis/Src/Context')
const Context = ioc.use('Adonis/Src/HttpContext')

const ctx = new Context()
ctx.request = helpers.getRequest(req)
Expand Down Expand Up @@ -88,7 +88,7 @@ test.group('Session', (group) => {
await ioc.use('App/Models/User').create({ email: 'foo@bar.com', password: 'secret' })

this.server.on('request', (req, res) => {
const Context = ioc.use('Adonis/Src/Context')
const Context = ioc.use('Adonis/Src/HttpContext')

const ctx = new Context()
ctx.request = helpers.getRequest(req)
Expand Down Expand Up @@ -117,7 +117,7 @@ test.group('Session', (group) => {
await ioc.use('App/Models/User').create({ email: 'foo@bar.com', password: 'secret' })

this.server.on('request', (req, res) => {
const Context = ioc.use('Adonis/Src/Context')
const Context = ioc.use('Adonis/Src/HttpContext')

const ctx = new Context()
ctx.request = helpers.getRequest(req)
Expand Down Expand Up @@ -150,7 +150,7 @@ test.group('Session', (group) => {
await ioc.use('App/Models/User').create({ email: 'foo@bar.com', password: 'secret' })

this.server.on('request', (req, res) => {
const Context = ioc.use('Adonis/Src/Context')
const Context = ioc.use('Adonis/Src/HttpContext')

const ctx = new Context()
ctx.request = helpers.getRequest(req)
Expand Down Expand Up @@ -179,7 +179,7 @@ test.group('Session', (group) => {

test('throw exception when cookie exists but user doesn\'t', async (assert) => {
this.server.on('request', (req, res) => {
const Context = ioc.use('Adonis/Src/Context')
const Context = ioc.use('Adonis/Src/HttpContext')

const ctx = new Context()
ctx.request = helpers.getRequest(req)
Expand Down Expand Up @@ -208,7 +208,7 @@ test.group('Session', (group) => {
await ioc.use('App/Models/User').create({ email: 'foo@bar.com', password: 'secret' })

this.server.on('request', (req, res) => {
const Context = ioc.use('Adonis/Src/Context')
const Context = ioc.use('Adonis/Src/HttpContext')

const ctx = new Context()
ctx.request = helpers.getRequest(req)
Expand Down Expand Up @@ -244,7 +244,7 @@ test.group('Session', (group) => {
await user.tokens().create({ token: '2020', is_revoked: false, type: 'remember_token' })

this.server.on('request', (req, res) => {
const Context = ioc.use('Adonis/Src/Context')
const Context = ioc.use('Adonis/Src/HttpContext')

const ctx = new Context()
ctx.request = helpers.getRequest(req)
Expand Down Expand Up @@ -277,7 +277,7 @@ test.group('Session', (group) => {
await ioc.use('App/Models/User').create({ email: 'foo@bar.com', password: 'secret' })

this.server.on('request', (req, res) => {
const Context = ioc.use('Adonis/Src/Context')
const Context = ioc.use('Adonis/Src/HttpContext')

const ctx = new Context()
ctx.request = helpers.getRequest(req)
Expand Down
2 changes: 1 addition & 1 deletion test/functional/setup/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Context._getters = {}
Context._macros = {}

module.exports = async () => {
ioc.bind('Adonis/Src/Context', () => {
ioc.bind('Adonis/Src/HttpContext', () => {
return Context
})

Expand Down

0 comments on commit 6075848

Please sign in to comment.