diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 12d84d670d7456023f0580a85d142a9004f51be9..886b6d265704180467fb467bdbd77eb71d1f0c0a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,6 +25,7 @@ build: stage: build script: - apk add make docker-compose + - make init-dev-mock-config - make build - docker save docker_testcenter-frontend-dev > frontend_image.tar artifacts: @@ -35,6 +36,7 @@ test-unit: stage: test script: - apk add make docker-compose + - make init-dev-mock-config - docker load -i frontend_image.tar - make run-detached - make test-unit @@ -43,6 +45,7 @@ test-e2e: stage: test script: - apk add make docker-compose + - make init-dev-mock-config - docker load -i frontend_image.tar - make run-detached - make test-e2e diff --git a/Makefile b/Makefile index 4849504e95b771bf598649eea0beedb02c9f4719..df93d9226b64c18efaa17666b10f278fa40e4ce4 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,9 @@ test-unit: test-e2e: docker-compose -f docker/docker-compose.yml exec -T testcenter-frontend-dev ng e2e --webdriver-update=false --port 4202 +init-dev-mock-config: + cp src/environments/environment.dev.mock.ts src/environments/environment.ts + init-dev-config: cp src/environments/environment.dev.ts src/environments/environment.ts diff --git a/README.md b/README.md index 6a6b3f207e8256d3b30d967799fdd2edc0ddaa08..9ff79a7e27dc6b2ff6a202e8940afacc53c14dfb 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [](https://opensource.org/licenses/MIT) -[](https://scm.cms.hu-berlin.de/iqb/verona-player-simple) - +[](https://scm.cms.hu-berlin.de/iqb/testcenter-frontend) + # Testcenter Frontend @@ -22,6 +22,11 @@ The repository for a complete setup of the application can be found [here](https All the necessary commands for running the application and starting the tests can be found in the Makefile on the root directory. +###### Prepare config +``` +make init-dev-mock-config +``` + ###### Start and Stop the server ``` make run diff --git a/e2e/src/app.e2e-spec.ts b/e2e/src/app.e2e-spec.ts index d98bef60c0a68cc58765b07394d637ec4d249947..6ba3931d299e67b2293ce19c237e822ad260bcbb 100644 --- a/e2e/src/app.e2e-spec.ts +++ b/e2e/src/app.e2e-spec.ts @@ -1,3 +1,5 @@ +import { browser, logging } from 'protractor'; + import LoginPage from './app.po'; describe('Testcenter Frontend', () => { @@ -6,4 +8,12 @@ describe('Testcenter Frontend', () => { await expect(LoginPage.getFirstCardTitle()).toEqual('Anmelden'); await expect(LoginPage.getSecondCardTitle()).toEqual('IQB-Testcenter'); }); + + afterEach(async () => { + // Assert that there are no errors emitted from the browser + const logs = await browser.manage().logs().get(logging.Type.BROWSER); + expect(logs).not.toContain(jasmine.objectContaining({ + level: logging.Level.SEVERE + } as logging.Entry)); + }); }); diff --git a/src/environments/environment.dev.mock.ts b/src/environments/environment.dev.mock.ts new file mode 100644 index 0000000000000000000000000000000000000000..65f3389d1d7b1b939ff5acae4584531ff2962b68 --- /dev/null +++ b/src/environments/environment.dev.mock.ts @@ -0,0 +1,7 @@ +export const environment = { + production: false, + testcenterUrl: 'http://localhost:8000/', + appPublisher: 'IQB - Institut zur Qualitätsentwicklung im Bildungswesen', + apiVersionExpected: '9.1.0', + veronaApiVersionSupported: '2.1.0' +};