diff --git a/cypress/integration/user/login.spec.js b/cypress/integration/user/login.spec.js index ce6086ce0..238ec77f4 100644 --- a/cypress/integration/user/login.spec.js +++ b/cypress/integration/user/login.spec.js @@ -8,7 +8,7 @@ const testAndAssertFailed = fixture => { cy.wait(5000) // It can take waaaayy too long to log the user in cy.url().should('include', '/') - cy.get('div.notification.is-danger').contains('Wrong username or password.') + cy.get('div.message.danger').contains('Wrong username or password.') } context('Login', () => { diff --git a/cypress/integration/user/registration.spec.js b/cypress/integration/user/registration.spec.js index fc1b0fbde..fd940aa7e 100644 --- a/cypress/integration/user/registration.spec.js +++ b/cypress/integration/user/registration.spec.js @@ -32,7 +32,7 @@ context('Registration', () => { cy.get('h2').should('contain', `Hi ${fixture.username}!`) }) - it('Should fail', () => { + it.only('Should fail', () => { const fixture = { username: 'test', password: '123456', @@ -45,6 +45,6 @@ context('Registration', () => { cy.get('#password').type(fixture.password) cy.get('#passwordValidation').type(fixture.password) cy.get('#register-submit').click() - cy.get('div.notification.is-danger').contains('A user with this username already exists.') + cy.get('div.message.danger').contains('A user with this username already exists.') }) }) \ No newline at end of file diff --git a/package.json b/package.json index dc5999958..626840aa8 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,10 @@ "ignorePatterns": [ "*.test.*", "cypress/*" - ] + ], + "globals": { + "defineProps": "readonly" + } }, "postcss": { "plugins": { diff --git a/src/components/misc/api-config.vue b/src/components/misc/api-config.vue index 07ca857b8..c0e542f3a 100644 --- a/src/components/misc/api-config.vue +++ b/src/components/misc/api-config.vue @@ -30,27 +30,25 @@ {{ $t('apiConfig.change') }} -
+ {{ successMsg }} -
-
+ + {{ errorMsg }} -
+ + + diff --git a/src/components/misc/no-auth-wrapper.vue b/src/components/misc/no-auth-wrapper.vue index fe4a5700e..01ab56812 100644 --- a/src/components/misc/no-auth-wrapper.vue +++ b/src/components/misc/no-auth-wrapper.vue @@ -2,14 +2,9 @@
@@ -17,6 +12,7 @@