Refactor auth config checks within tests (#3694)

Ref #3652 #3393
This commit is contained in:
Paul Melnikow
2019-07-11 18:11:34 -04:00
committed by GitHub
parent e2608a6570
commit ace66f457d
3 changed files with 7 additions and 6 deletions

View File

@@ -3,7 +3,7 @@
const { expect } = require('chai')
const Camp = require('camp')
const portfinder = require('portfinder')
const serverSecrets = require('../lib/server-secrets')
const config = require('config').util.toObject()
const got = require('../core/got-test-client')
const { setRoutes } = require('./suggest')
const GithubApiProvider = require('./github/github-api-provider')
@@ -13,7 +13,7 @@ describe('GitHub badge suggestions', function() {
let token, apiProvider
before(function() {
token = serverSecrets.gh_token
token = config.private.gh_token
if (!token) {
throw Error('The integration tests require a gh_token to be set')
}

View File

@@ -1,6 +1,6 @@
'use strict'
const serverSecrets = require('../../lib/server-secrets')
const runnerConfig = require('config').util.toObject()
const sampleProjectUuid = '45afb680-d4e6-4e66-93ea-bcfa79eb8a87'
@@ -88,7 +88,8 @@ const config = {
function checkShouldSkip() {
const noToken =
!serverSecrets.sl_insight_userUuid || !serverSecrets.sl_insight_apiToken
!runnerConfig.private.sl_insight_userUuid ||
!runnerConfig.private.sl_insight_apiToken
if (noToken) {
console.warn(
'No Symfony credentials configured. Service tests will be skipped. Add credentials in local.yml to run these tests.'

View File

@@ -1,10 +1,10 @@
'use strict'
const serverSecrets = require('../../lib/server-secrets')
const config = require('config').util.toObject()
const t = (module.exports = require('../tester').createServiceTester())
function checkShouldSkip() {
const noToken = !serverSecrets.wheelmap_token
const noToken = !config.private.wheelmap_token
if (noToken) {
console.warn(
'No Wheelmap token configured. Service tests will be skipped. Add a token in local.yml to run these tests.'