Skip to content

E2e updates #489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
landonreed merged 5 commits into from
Sep 24, 2019
Merged

E2e updates #489

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a25153b
ci: fix some e2e configuration for Travis environment
evansiroky Sep 23, 2019
ee479ac
ci(e2e): peg dt-server jar to a specific commit
evansiroky Sep 23, 2019
f1b1b53
ci(e2e): make dt-server commit not be from ec2-deploy branch
evansiroky Sep 23, 2019
41b151a
ci(e2e): remove temporary activation of e2e testing on all CI runs
evansiroky Sep 23, 2019
d3dda33
ci(e2e): change back to using latest dev branch jar file
evansiroky Sep 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions __tests__/test-utils/setup-e2e.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ async function startBackendServer () {
const serverJarFile = path.join(serverFolder, serverJarFilename)
const envFile = path.join(serverFolder, 'env.yml')
const serverFile = path.join(serverFolder, 'server.yml')
const baseDtServerGithubConfigUrl = 'https://raw.githubusercontent.com/ibi-group/datatools-server/e2e-coverage/configurations/default/'
const baseDtServerGithubConfigUrl = 'https://raw.githubusercontent.com/ibi-group/datatools-server/dev/configurations/default/'

try {
await auto({
Expand Down Expand Up @@ -273,16 +273,11 @@ async function startClientServer () {
console.log('writing client settings.yml template')

const {
S3_BUCKET,
TRANSITFEEDS_KEY
S3_BUCKET
} = process.env

const clientSettings = results.loadDefaultSettingsYml
clientSettings.S3_BUCKET = S3_BUCKET
clientSettings.application.data.gtfs_s3_bucket = S3_BUCKET
clientSettings.application.data.use_s3_storage = true
clientSettings.modules.deployment = { enabled: true }
clientSettings.extensions.transitfeeds.key = TRANSITFEEDS_KEY
return writeYamlFile(
path.join(defaultConfigFolder, 'settings.yml'),
clientSettings
Expand Down Expand Up @@ -325,8 +320,9 @@ async function startClientServer () {
}
]
})
} catch (e) {

} catch (err) {
console.error(`failed to start frontend server due to error: ${err}`)
throw err
}

console.log('successfully started client dev server')
Expand Down