Fixed router

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

3 files changed, 17 insertions, 15 deletions

diff --git a/settings/js/main.js b/settings/js/main.js
index 006504c523f..5402d540da6 100644
--- a/settings/js/main.js
+++ b/settings/js/main.js
@@ -263,7 +263,7 @@ eval("var render = function() {\n  var _vm = this\n  var _h = _vm.$createElement
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-eval("/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_vue__ = __webpack_require__(3);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_vue_router__ = __webpack_require__(30);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__views_Users__ = __webpack_require__(31);\n\n\n\n\n__WEBPACK_IMPORTED_MODULE_0_vue__[\"a\" /* default */].use(__WEBPACK_IMPORTED_MODULE_1_vue_router__[\"a\" /* default */]);\n\n/*\n * This is the list of routes where the vuejs app will\n * take over php to provide data\n * You need to forward the php routing (routes.php) to\n * /settings/main.php, where the vue-router will ensure\n * the proper route.\n * ⚠️ Routes needs to match the php routes.\n */\n\n/* harmony default export */ __webpack_exports__[\"a\"] = (new __WEBPACK_IMPORTED_MODULE_1_vue_router__[\"a\" /* default */]({\n\tmode: 'history',\n\troutes: [{\n\t\tpath: '(/index.php)?/settings/users',\n\t\tcomponent: __WEBPACK_IMPORTED_MODULE_2__views_Users__[\"a\" /* default */],\n\t\tprops: true,\n\t\tname: 'users',\n\t\tchildren: [{\n\t\t\tpath: ':selectedGroup',\n\t\t\tname: 'group',\n\t\t\tcomponent: __WEBPACK_IMPORTED_MODULE_2__views_Users__[\"a\" /* default */]\n\t\t}]\n\t}]\n}));\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8vLi9zcmMvcm91dGVyLmpzPzcwN2IiXSwibmFtZXMiOlsiVnVlIiwidXNlIiwibW9kZSIsInJvdXRlcyIsInBhdGgiLCJjb21wb25lbnQiLCJwcm9wcyIsIm5hbWUiLCJjaGlsZHJlbiIsIlVzZXJzIl0sIm1hcHBpbmdzIjoiOzs7QUFBQTtBQUNBO0FBQ0E7O0FBRUEsb0RBQUFBLENBQUlDLEdBQUosQ0FBUSwyREFBUjs7QUFFQTs7Ozs7Ozs7O0FBU0EseURBQWUsSUFBSSwyREFBSixDQUFXO0FBQ3pCQyxPQUFNLFNBRG1CO0FBRXpCQyxTQUFRLENBQUM7QUFDUkMsUUFBTSw4QkFERTtBQUVSQyxhQUFXLDZEQUZIO0FBR1JDLFNBQU8sSUFIQztBQUlSQyxRQUFNLE9BSkU7QUFLUkMsWUFBVSxDQUFDO0FBQ1JKLFNBQU0sZ0JBREU7QUFFUkcsU0FBTSxPQUZFO0FBR1JGLGNBQVcsNkRBQUFJO0FBSEgsR0FBRDtBQUxGLEVBQUQ7QUFGaUIsQ0FBWCxDQUFmIiwiZmlsZSI6IjI5LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFZ1ZSBmcm9tICd2dWUnO1xuaW1wb3J0IFJvdXRlciBmcm9tICd2dWUtcm91dGVyJztcbmltcG9ydCBVc2VycyBmcm9tICcuL3ZpZXdzL1VzZXJzJztcblxuVnVlLnVzZShSb3V0ZXIpO1xuXG4vKlxuICogVGhpcyBpcyB0aGUgbGlzdCBvZiByb3V0ZXMgd2hlcmUgdGhlIHZ1ZWpzIGFwcCB3aWxsXG4gKiB0YWtlIG92ZXIgcGhwIHRvIHByb3ZpZGUgZGF0YVxuICogWW91IG5lZWQgdG8gZm9yd2FyZCB0aGUgcGhwIHJvdXRpbmcgKHJvdXRlcy5waHApIHRvXG4gKiAvc2V0dGluZ3MvbWFpbi5waHAsIHdoZXJlIHRoZSB2dWUtcm91dGVyIHdpbGwgZW5zdXJlXG4gKiB0aGUgcHJvcGVyIHJvdXRlLlxuICog4pqg77iPIFJvdXRlcyBuZWVkcyB0byBtYXRjaCB0aGUgcGhwIHJvdXRlcy5cbiAqL1xuXG5leHBvcnQgZGVmYXVsdCBuZXcgUm91dGVyKHtcblx0bW9kZTogJ2hpc3RvcnknLFxuXHRyb3V0ZXM6IFt7XG5cdFx0cGF0aDogJygvaW5kZXgucGhwKT8vc2V0dGluZ3MvdXNlcnMnLFxuXHRcdGNvbXBvbmVudDogVXNlcnMsXG5cdFx0cHJvcHM6IHRydWUsXG5cdFx0bmFtZTogJ3VzZXJzJyxcblx0XHRjaGlsZHJlbjogW3tcblx0XHRcdCAgcGF0aDogJzpzZWxlY3RlZEdyb3VwJyxcblx0XHRcdCAgbmFtZTogJ2dyb3VwJyxcblx0XHRcdCAgY29tcG9uZW50OiBVc2Vyc1xuXHRcdFx0fSxcblx0XHRdXG5cdH1dXG59KTtcblxuXG4vLyBXRUJQQUNLIEZPT1RFUiAvL1xuLy8gLi9zcmMvcm91dGVyLmpzIl0sInNvdXJjZVJvb3QiOiIifQ==\n//# sourceURL=webpack-internal:///29\n");
+eval("/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_vue__ = __webpack_require__(3);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_vue_router__ = __webpack_require__(30);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__views_Users__ = __webpack_require__(31);\n\n\n\n\n__WEBPACK_IMPORTED_MODULE_0_vue__[\"a\" /* default */].use(__WEBPACK_IMPORTED_MODULE_1_vue_router__[\"a\" /* default */]);\n\n/*\n * This is the list of routes where the vuejs app will\n * take over php to provide data\n * You need to forward the php routing (routes.php) to\n * /settings/main.php, where the vue-router will ensure\n * the proper route.\n * ⚠️ Routes needs to match the php routes.\n */\n\n/* harmony default export */ __webpack_exports__[\"a\"] = (new __WEBPACK_IMPORTED_MODULE_1_vue_router__[\"a\" /* default */]({\n\tmode: 'history',\n\troutes: [{\n\t\tpath: '/:index(index.php/)?settings/users',\n\t\tcomponent: __WEBPACK_IMPORTED_MODULE_2__views_Users__[\"a\" /* default */],\n\t\tprops: true,\n\t\tname: 'users',\n\t\tchildren: [{\n\t\t\tpath: ':selectedGroup',\n\t\t\tname: 'group',\n\t\t\tcomponent: __WEBPACK_IMPORTED_MODULE_2__views_Users__[\"a\" /* default */]\n\t\t}]\n\t}]\n}));\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8vLi9zcmMvcm91dGVyLmpzPzcwN2IiXSwibmFtZXMiOlsiVnVlIiwidXNlIiwibW9kZSIsInJvdXRlcyIsInBhdGgiLCJjb21wb25lbnQiLCJwcm9wcyIsIm5hbWUiLCJjaGlsZHJlbiIsIlVzZXJzIl0sIm1hcHBpbmdzIjoiOzs7QUFBQTtBQUNBO0FBQ0E7O0FBRUEsb0RBQUFBLENBQUlDLEdBQUosQ0FBUSwyREFBUjs7QUFFQTs7Ozs7Ozs7O0FBU0EseURBQWUsSUFBSSwyREFBSixDQUFXO0FBQ3pCQyxPQUFNLFNBRG1CO0FBRXpCQyxTQUFRLENBQ1A7QUFDQ0MsUUFBTSxvQ0FEUDtBQUVDQyxhQUFXLDZEQUZaO0FBR0NDLFNBQU8sSUFIUjtBQUlDQyxRQUFNLE9BSlA7QUFLQ0MsWUFBVSxDQUNUO0FBQ0NKLFNBQU0sZ0JBRFA7QUFFQ0csU0FBTSxPQUZQO0FBR0NGLGNBQVcsNkRBQUFJO0FBSFosR0FEUztBQUxYLEVBRE87QUFGaUIsQ0FBWCxDQUFmIiwiZmlsZSI6IjI5LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFZ1ZSBmcm9tICd2dWUnO1xuaW1wb3J0IFJvdXRlciBmcm9tICd2dWUtcm91dGVyJztcbmltcG9ydCBVc2VycyBmcm9tICcuL3ZpZXdzL1VzZXJzJztcblxuVnVlLnVzZShSb3V0ZXIpO1xuXG4vKlxuICogVGhpcyBpcyB0aGUgbGlzdCBvZiByb3V0ZXMgd2hlcmUgdGhlIHZ1ZWpzIGFwcCB3aWxsXG4gKiB0YWtlIG92ZXIgcGhwIHRvIHByb3ZpZGUgZGF0YVxuICogWW91IG5lZWQgdG8gZm9yd2FyZCB0aGUgcGhwIHJvdXRpbmcgKHJvdXRlcy5waHApIHRvXG4gKiAvc2V0dGluZ3MvbWFpbi5waHAsIHdoZXJlIHRoZSB2dWUtcm91dGVyIHdpbGwgZW5zdXJlXG4gKiB0aGUgcHJvcGVyIHJvdXRlLlxuICog4pqg77iPIFJvdXRlcyBuZWVkcyB0byBtYXRjaCB0aGUgcGhwIHJvdXRlcy5cbiAqL1xuXG5leHBvcnQgZGVmYXVsdCBuZXcgUm91dGVyKHtcblx0bW9kZTogJ2hpc3RvcnknLFxuXHRyb3V0ZXM6IFtcblx0XHR7XG5cdFx0XHRwYXRoOiAnLzppbmRleChpbmRleC5waHAvKT9zZXR0aW5ncy91c2VycycsXG5cdFx0XHRjb21wb25lbnQ6IFVzZXJzLFxuXHRcdFx0cHJvcHM6IHRydWUsXG5cdFx0XHRuYW1lOiAndXNlcnMnLFxuXHRcdFx0Y2hpbGRyZW46IFtcblx0XHRcdFx0e1xuXHRcdFx0XHRcdHBhdGg6ICc6c2VsZWN0ZWRHcm91cCcsXG5cdFx0XHRcdFx0bmFtZTogJ2dyb3VwJyxcblx0XHRcdFx0XHRjb21wb25lbnQ6IFVzZXJzXG5cdFx0XHRcdH1cblx0XHRcdF1cblx0XHR9XG5cdF1cbn0pO1xuXG5cblxuLy8gV0VCUEFDSyBGT09URVIgLy9cbi8vIC4vc3JjL3JvdXRlci5qcyJdLCJzb3VyY2VSb290IjoiIn0=\n//# sourceURL=webpack-internal:///29\n");
 
 /***/ }),
 /* 30 */
diff --git a/settings/src/router.js b/settings/src/router.js
index a1d6470ceb1..783e466b94f 100644
--- a/settings/src/router.js
+++ b/settings/src/router.js
@@ -15,16 +15,19 @@ Vue.use(Router);
 
 export default new Router({
 	mode: 'history',
-	routes: [{
-		path: '(/index.php)?/settings/users',
-		component: Users,
-		props: true,
-		name: 'users',
-		children: [{
-			  path: ':selectedGroup',
-			  name: 'group',
-			  component: Users
-			},
-		]
-	}]
-});
\ No newline at end of file
+	routes: [
+		{
+			path: '/:index(index.php/)?settings/users',
+			component: Users,
+			props: true,
+			name: 'users',
+			children: [
+				{
+					path: ':selectedGroup',
+					name: 'group',
+					component: Users
+				}
+			]
+		}
+	]
+});
diff --git a/tests/acceptance/features/login.feature b/tests/acceptance/features/login.feature
index 3db8c4945ec..3a31d3f88bd 100644
--- a/tests/acceptance/features/login.feature
+++ b/tests/acceptance/features/login.feature
@@ -18,7 +18,6 @@ Feature: login
     And I am logged in as the admin
     And I open the User settings
     And I set the password for user0 to 654321
-    And I see that the "Password successfully changed" notification is shown
     And I act as John
     And I log in with user user0 and password 654321
     Then I see that the current page is the Files app