diff --git a/.github/workflows/haiku-push-main-cd.yml b/.github/workflows/haiku-push-main-cd.yml index f86c45f..d38da88 100644 --- a/.github/workflows/haiku-push-main-cd.yml +++ b/.github/workflows/haiku-push-main-cd.yml @@ -88,7 +88,7 @@ jobs: environment: name: 'DEV' - url: 'https://gapdemodev.azurewebsites.net' + url: 'https://github-actions-demo-dev-2024.azurewebsites.net' steps: @@ -111,7 +111,7 @@ jobs: - name: 'Deploy to DEV Azure webapp using OIDC' uses: azure/webapps-deploy@v2.2.10 with: - app-name: gapdemodev # Replace with your app name + app-name: github-actions-demo-dev-2024 # Replace with your app name package: deployment-package @@ -126,7 +126,7 @@ jobs: environment: name: 'STAGING' - url: 'https://gapdemostaging.azurewebsites.net' + url: 'https://github-actions-demo-staging-2024.azurewebsites.net' steps: @@ -148,7 +148,7 @@ jobs: - name: 'Deploy to STAGING Azure webapp using OIDC' uses: azure/webapps-deploy@v2.2.10 with: - app-name: gapdemostaging # Replace with your app name + app-name: github-actions-demo-staging-2024 # Replace with your app name package: deployment-package deploy-to-prod: @@ -163,7 +163,7 @@ jobs: environment: name: 'PROD' - url: 'https://gapdemoprod.azurewebsites.net' + url: 'https://github-actions-demo-prod-2024.azurewebsites.net' steps: @@ -185,6 +185,6 @@ jobs: - name: 'Deploy to PROD Azure webapp using OIDC' uses: azure/webapps-deploy@v2.2.10 with: - app-name: gapdemoprod # Replace with your app name + app-name: github-actions-demo-prod-2024 # Replace with your app name package: deployment-package diff --git a/haiku-src/haiku-tests.js b/haiku-src/haiku-tests.js index 77d88d3..cea9903 100644 --- a/haiku-src/haiku-tests.js +++ b/haiku-src/haiku-tests.js @@ -38,7 +38,7 @@ describe('GET /nonexistent', () => { request(app) .get('/nonexistent') .expect('Content-Type', /html/) - .expect(400) + .expect(404) .end((err, res) => { if (err) return done(err); expect(res.status).to.equal(404); diff --git a/haiku-src/haikus.json b/haiku-src/haikus.json index 2e8f99d..473e949 100644 --- a/haiku-src/haikus.json +++ b/haiku-src/haikus.json @@ -1,6 +1,6 @@ [ { - "text": "rain in tupelo,\ndon't forget an umbrella,\nor it will be gloom", + "text": "rain in SCS ,\ndon't forget an umbrella,\nor it will be gloom", "image": "puddle_jumper_octodex.jpg" }, { diff --git a/haiku-src/index.js b/haiku-src/index.js index 82f1577..8b88b0b 100644 --- a/haiku-src/index.js +++ b/haiku-src/index.js @@ -1,7 +1,7 @@ let express = require('express'); let app = express(); let ejs = require('ejs'); -/* +/* * const haikus = require('./haikus.json'); const port = process.env.PORT || 3000; @@ -17,6 +17,7 @@ app.listen(port); const haikus = require('./haikus.json'); //const express = require('express'); //const app = express(); +//added a comment app.use(express.static('public')) app.set('view engine', 'ejs');