fix local storage restore on useRole with preserveURL (DevExpress#2015)

src/errors/test-run/index.js

@@ -200,6 +200,12 @@ export class ActionStringArgumentError extends ActionArgumentErrorBase {
     }
 }
 
+export class ActionNullableStringArgumentError extends ActionArgumentErrorBase {
+    constructor (argumentName, actualValue) {
+        super(TYPE.actionNullableStringArgumentError, argumentName, actualValue);
+    }
+}
+
 export class ActionIntegerArgumentError extends ActionArgumentErrorBase {
     constructor (argumentName, actualValue) {
         super(TYPE.actionIntegerArgumentError, argumentName, actualValue);

src/errors/test-run/templates.js

@@ -113,6 +113,10 @@ export default {
         The "${err.argumentName}" argument is expected to be a non-empty string, but it was ${err.actualValue}.
     `),
 
+    [TYPE.actionNullableStringArgumentError]: err => markup(err, `
+        The "${err.argumentName}" argument is expected to be a a null or a string, but it was ${err.actualValue}.
+    `),
+
     [TYPE.actionStringOrStringArrayArgumentError]: err => markup(err, `
         The "${err.argumentName}" argument is expected to be a non-empty string or a string array, but it was ${err.actualValue}.
     `),

src/errors/test-run/type.js

@@ -16,6 +16,7 @@ export default {
     actionSpeedOptionError:                            'actionSpeedOptionError',
     actionOptionsTypeError:                            'actionOptionsTypeError',
     actionStringArgumentError:                         'actionStringArgumentError',
+    actionNullableStringArgumentError:                 'actionNullableStringArgumentError',
     actionStringOrStringArrayArgumentError:            'actionStringOrStringArrayArgumentError',
     actionStringArrayElementError:                     'actionStringArrayElementError',
     actionIntegerArgumentError:                        'actionIntegerArgumentError',

src/test-run/bookmark.js

@@ -107,7 +107,7 @@ export default class TestRunBookmark {
             var preserveUrl = this.role.opts.preserveUrl;
             var url = preserveUrl ? this.role.url : this.url;
 
-            await this._restorePage(url, storages);
+            await this._restorePage(url, JSON.stringify(storages));
 
             if (!preserveUrl)
                 await this._restoreWorkingFrame();

src/test-run/commands/actions.js

@@ -10,6 +10,7 @@ import {
     integerArgument,
     positiveIntegerArgument,
     nonEmptyStringArgument,
+    nullableStringArgument,
     urlArgument,
     stringOrStringArrayArgument,
     setSpeedArgument,
@@ -332,7 +333,7 @@ export class NavigateToCommand extends Assignable {
     _getAssignableProperties () {
         return [
             { name: 'url', type: urlArgument, required: true },
-            { name: 'storages' }
+            { name: 'storages', type: nullableStringArgument }
         ];
     }
 }

src/test-run/commands/validations/argument.js

@@ -12,6 +12,7 @@ import {
     ActionOptionsTypeError,
     ActionBooleanArgumentError,
     ActionStringArgumentError,
+    ActionNullableStringArgumentError,
     ActionIntegerArgumentError,
     ActionRoleArgumentError,
     ActionPositiveIntegerArgumentError,
@@ -57,6 +58,15 @@ export function nonEmptyStringArgument (argument, val, createError) {
         throw createError('""');
 }
 
+export function nullableStringArgument (argument, val) {
+    if (val === null) return;
+
+    var type = typeof val;
+
+    if (type !== 'string')
+        throw new ActionNullableStringArgumentError(argument, type);
+}
+
 export function urlArgument (name, val) {
     nonEmptyStringArgument(name, val);
 

src/test-run/index.js

@@ -374,7 +374,7 @@ export default class TestRun extends Session {
         const command = this.currentDriverTask.command;
 
         if (command.type === COMMAND_TYPE.navigateTo && command.storages)
-            this.useStateSnapshot({ storages: command.storages });
+            this.useStateSnapshot({ storages: JSON.parse(command.storages) });
 
         return command;
     }