Skip to content

Commit

Permalink
Switch back to Heroku demo instance for e2e testing
Browse files Browse the repository at this point in the history
  • Loading branch information
bkimminich committed Apr 12, 2021
1 parent 6dd769f commit e2c5a62
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
- name: "Execute e2e tests"
uses: nick-invision/retry@v2
with:
timeout_minutes: 10
timeout_minutes: 15
max_attempts: 3
command: npm run e2e
- name: "Prepare coverage data"
Expand Down
14 changes: 7 additions & 7 deletions test/e2e/juiceShopCtfCli-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ describe('juice-shop-ctf', () => {

it('should accept a config file', function () {
fs.writeFileSync(configFile, `
juiceShopUrl: https://juice-shop-staging.herokuapp.com
juiceShopUrl: https://juice-shop.herokuapp.com
ctfKey: https://raw.githubusercontent.com/bkimminich/juice-shop/master/ctf.key
insertHints: paid
insertHintUrls: paid
Expand All @@ -125,7 +125,7 @@ insertHintSnippets: paid`)

it('should fail when the config file cannot be parsed', function () {
fs.writeFileSync(configFile, `
juiceShopUrl: https://juice-shop-staging.herokuapp.com
juiceShopUrl: https://juice-shop.herokuapp.com
ctfKey: https://raw.githubusercontent.com/bkimminich/juice-shop/master/ctf.key
insertHints`)

Expand All @@ -136,7 +136,7 @@ insertHints`)

it('should fail when the config file contains invalid values', function () {
fs.writeFileSync(configFile, `
juiceShopUrl: https://juice-shop-staging.herokuapp.com
juiceShopUrl: https://juice-shop.herokuapp.com
ctfKey: https://raw.githubusercontent.com/bkimminich/juice-shop/master/ctf.key
insertHints: paid
insertHintUrls: invalidValue
Expand All @@ -149,7 +149,7 @@ insertHintSnippets: paid`)

it('should write the output file to the specified location', function () {
fs.writeFileSync(configFile, `
juiceShopUrl: https://juice-shop-staging.herokuapp.com
juiceShopUrl: https://juice-shop.herokuapp.com
ctfKey: https://raw.githubusercontent.com/bkimminich/juice-shop/master/ctf.key
insertHints: paid
insertHintUrls: paid
Expand All @@ -164,7 +164,7 @@ insertHintSnippets: paid`)
it('should be possible to create a CTFd export with a config file', function () {
fs.writeFileSync(configFile, `
ctfFramework: CTFd
juiceShopUrl: https://juice-shop-staging.herokuapp.com
juiceShopUrl: https://juice-shop.herokuapp.com
ctfKey: https://raw.githubusercontent.com/bkimminich/juice-shop/master/ctf.key
insertHints: paid
insertHintUrls: paid
Expand All @@ -179,7 +179,7 @@ insertHintSnippets: paid`)
it('should be possible to create a FBCTF export with a config file', function () {
fs.writeFileSync(configFile, `
ctfFramework: FBCTF
juiceShopUrl: https://juice-shop-staging.herokuapp.com
juiceShopUrl: https://juice-shop.herokuapp.com
ctfKey: https://raw.githubusercontent.com/bkimminich/juice-shop/master/ctf.key
countryMapping: https://raw.githubusercontent.com/bkimminich/juice-shop/master/config/fbctf.yml
insertHints: paid
Expand All @@ -195,7 +195,7 @@ insertHintSnippets: paid`)
it('should be possible to create a RootTheBox export with a config file', function () {
fs.writeFileSync(configFile, `
ctfFramework: RootTheBox
juiceShopUrl: https://juice-shop-staging.herokuapp.com
juiceShopUrl: https://juice-shop.herokuapp.com
ctfKey: https://raw.githubusercontent.com/bkimminich/juice-shop/master/ctf.key
insertHints: paid
insertHintUrls: paid
Expand Down

0 comments on commit e2c5a62

Please sign in to comment.