Merge pull request #923 from nextcloud/feature/noid/update-vue-to-7

Bump @nextcloud/vue to 7 beta

cypress/integration/settings.spec.js

@@ -38,13 +38,13 @@ describe('Check that user\'s settings survive a reload', () => {
 	})
 
 	it('Form survive a reload', () => {
-		cy.get("#app-content input[type='checkbox']").uncheck({force: true}).should('not.be.checked')
+		cy.get("#app-content input[type='checkbox']").uncheck({ force: true }).should('not.be.checked')
 
 		cy.reload()
 
-		cy.get("#app-content input[type='checkbox']").uncheck({force: true}).should('not.be.checked')
+		cy.get("#app-content input[type='checkbox']").uncheck({ force: true }).should('not.be.checked')
 
-		cy.get("#file_changed_notification").check({force: true})
+		cy.get("#file_changed_notification").check({ force: true })
 		cy.contains("A calendar was modified").click()
 		cy.contains("Comments for files").click()
 		cy.contains("Your password or email was modified").click()
@@ -95,21 +95,27 @@ describe('Check that user\'s settings survive a reload', () => {
 	})
 
 	it('Activity summary survive a reload', () => {
-		let input = cy.get("#app-content").contains("Send daily activity summary in the morning").parentsUntil('.settings-section').children('input')
-
-		input.check({force: true})
-		input.should('be.checked')
-
-		cy.reload()
-		input = cy.get("#app-content").contains("Send daily activity summary in the morning").parentsUntil('.settings-section').children('input')
-
-		input.should('be.checked')
-
-		input.uncheck({force: true})
-
-		cy.reload()
-		input = cy.get("#app-content").contains("Send daily activity summary in the morning").parentsUntil('.settings-section').children('input')
-
-		input.should('not.be.checked')
+		cy.intercept({ method: 'POST', url: '**/activity/settings' }).as("apiCall");
+
+		cy.get("#app-content")
+			.contains("Send daily activity summary in the morning")
+			.find('input')
+			.check({ force: true })
+			.should('be.checked')
+			.wait('@apiCall')
+			.reload()
+
+		cy.get("#app-content")
+			.contains("Send daily activity summary in the morning")
+			.find('input')
+			.should('be.checked')
+			.uncheck({ force: true })
+			.wait('@apiCall')
+			.reload()
+
+		cy.get("#app-content")
+			.contains("Send daily activity summary in the morning")
+			.find('input')
+			.should('not.be.checked')
 	})
 })

cypress/utils/index.js

@@ -20,6 +20,4 @@
  *
  */
 
-const randHash = () => Math.random().toString(36).replace(/[^a-z]+/g, '').substr(0, 10)
-
-export default { randHash }
+export const randHash = () => Math.random().toString(36).replace(/[^a-z]+/g, '').substr(0, 10)

js/activity-adminSettings.js.LICENSE.txt

@@ -30,7 +30,7 @@ object-assign
  * @license MIT
  */
 
-/*! For license information please see CheckboxRadioSwitch.js.LICENSE.txt */
+/*! For license information please see NcCheckboxRadioSwitch.js.LICENSE.txt */
 
 /*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
 

js/activity-personalSettings.js.LICENSE.txt

@@ -30,7 +30,7 @@ object-assign
  * @license MIT
  */
 
-/*! For license information please see CheckboxRadioSwitch.js.LICENSE.txt */
+/*! For license information please see NcCheckboxRadioSwitch.js.LICENSE.txt */
 
 /*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
 

js/activity-sidebar.js.LICENSE.txt

@@ -46,11 +46,21 @@ object-assign
  * Licensed under the MIT License.
  */
 
-/*! For license information please see Avatar.js.LICENSE.txt */
+/*!
+* focus-trap 7.0.0
+* @license MIT, https://github.com/focus-trap/focus-trap/blob/master/LICENSE
+*/
 
-/*! For license information please see Tooltip.js.LICENSE.txt */
+/*!
+* tabbable 6.0.0
+* @license MIT, https://github.com/focus-trap/tabbable/blob/master/LICENSE
+*/
+
+/*! For license information please see NcAvatar.js.LICENSE.txt */
 
-/*! For license information please see UserBubble.js.LICENSE.txt */
+/*! For license information please see NcUserBubble.js.LICENSE.txt */
+
+/*! For license information please see Tooltip.js.LICENSE.txt */
 
 /*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
 
@@ -78,31 +88,6 @@ object-assign
  *
  */
 
-/**!
- * @fileOverview Kickass library to create and place poppers near their reference elements.
- * @version 1.16.1
- * @license
- * Copyright (c) 2016 Federico Zivolo and contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
 //! authors : Tim Wood, Iskren Chernev, Moment.js contributors
 
 //! license : MIT