Skip to content

Commit 7bd690b

Browse files
committed
Merge branch 'adding-nodejs-tests' of https://github.com/adlnet/ADL_LRS into adding-nodejs-tests
2 parents 56ad6da + 692eb24 commit 7bd690b

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

.github/workflows/cicd.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@ jobs:
3131
sudo docker-compose up -d
3232
echo 'deployed successfully on server' "
3333
34+
- name: Check the deployed service URL
35+
uses: jtalk/url-health-check-action@v4
36+
with:
37+
url: ${{ secrets.ADLNET_STAGING_LRS_HOST_URL }}
38+
max-attempts: 10
39+
retry-delay: 10s
40+
3441
cypress-testing:
3542
name: Cypress run
3643
environment: staging
@@ -42,10 +49,13 @@ jobs:
4249
LRS_PASSWORD: ${{ secrets.ADLNET_STAGING_LRS_PASSWORD }}
4350
LRS_HOST_URL: ${{ secrets.ADLNET_STAGING_LRS_HOST_URL }}
4451
steps:
52+
- name: Checkout
53+
uses: actions/checkout@v2
54+
4555
- name: Cypress run
4656
uses: cypress-io/github-action@v6
4757
with:
48-
working-directory: tests/cypress
58+
working-directory: ./tests/cypress
4959

5060
conformance-testing:
5161
runs-on: ubuntu-latest
@@ -64,7 +74,7 @@ jobs:
6474
owner: adlnet
6575
repository: lrs-conformance-test-suite
6676
depth: 1
67-
branch: master
77+
branch: adding-back-compat
6878

6979
- name: Run LRS Conformance Suite
7080
run: |

tests/cypress/e2e/login.cy.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ describe("Logged-In Behavior", () => {
66

77
it("Allows Admin to Log In.", () => {
88

9-
let adminName = Cypress.env("LRS_ADMIN_NAME");
10-
let adminPass = Cypress.env("LRS_ADMIN_PASS");
9+
let adminName = Cypress.env("LRS_USERNAME");
10+
let adminPass = Cypress.env("LRS_PASSWORD");
1111

1212
cy.get('#menuLink1').click();
1313

0 commit comments

Comments
 (0)