From 75af920f1d422622226ba8aeefe49620d12eb039 Mon Sep 17 00:00:00 2001 From: liabru Date: Mon, 17 Aug 2015 00:47:26 +0100 Subject: [PATCH] change browser tests to use JSON.stringify --- test/browser/TestDemo.js | 20 ++++++++++---------- test/{browser => }/lib/resurrect.js | 0 2 files changed, 10 insertions(+), 10 deletions(-) rename test/{browser => }/lib/resurrect.js (100%) diff --git a/test/browser/TestDemo.js b/test/browser/TestDemo.js index 989ce3af..dbf7bd8c 100644 --- a/test/browser/TestDemo.js +++ b/test/browser/TestDemo.js @@ -1,6 +1,6 @@ var page = require('webpage').create(); var fs = require('fs'); -var Resurrect = require('./lib/resurrect'); +var Resurrect = require('../lib/resurrect'); var compare = require('fast-json-patch').compare; var system = require('system'); @@ -70,11 +70,11 @@ var test = function(status) { return engine.world; }, demo, frames); - worldEnd = resurrect.resurrect(resurrect.stringify(worldEnd, precisionLimiter)); - worldStart = resurrect.resurrect(resurrect.stringify(worldStart, precisionLimiter)); + worldEnd = JSON.parse(resurrect.stringify(worldEnd, precisionLimiter)); + worldStart = JSON.parse(resurrect.stringify(worldStart, precisionLimiter)); if (fs.exists(worldStartPath)) { - var worldStartRef = resurrect.resurrect(fs.read(worldStartPath)); + var worldStartRef = JSON.parse(fs.read(worldStartPath)); var worldStartDiff = compare(worldStartRef, worldStart); if (worldStartDiff.length !== 0) { @@ -84,18 +84,18 @@ var test = function(status) { if (forceUpdate) { hasCreated = true; - fs.write(worldStartPath, resurrect.stringify(worldStart, precisionLimiter, 2), 'w'); + fs.write(worldStartPath, JSON.stringify(worldStart, precisionLimiter, 2), 'w'); } else { hasChanged = true; } } } else { hasCreated = true; - fs.write(worldStartPath, resurrect.stringify(worldStart, precisionLimiter, 2), 'w'); + fs.write(worldStartPath, JSON.stringify(worldStart, precisionLimiter, 2), 'w'); } if (fs.exists(worldEndPath)) { - var worldEndRef = resurrect.resurrect(fs.read(worldEndPath)); + var worldEndRef = JSON.parse(fs.read(worldEndPath)); var worldEndDiff = compare(worldEndRef, worldEnd); if (worldEndDiff.length !== 0) { @@ -105,14 +105,14 @@ var test = function(status) { if (forceUpdate) { hasCreated = true; - fs.write(worldEndPath, resurrect.stringify(worldEnd, precisionLimiter, 2), 'w'); + fs.write(worldEndPath, JSON.stringify(worldEnd, precisionLimiter, 2), 'w'); } else { hasChanged = true; } } } else { hasCreated = true; - fs.write(worldEndPath, resurrect.stringify(worldEnd, precisionLimiter, 2), 'w'); + fs.write(worldEndPath, JSON.stringify(worldEnd, precisionLimiter, 2), 'w'); } if (hasChanged) { @@ -167,7 +167,7 @@ page.onError = function(msg, trace) { if (trace && trace.length) { trace.forEach(function(t) { - msgStack.push(' -> ' + (t.file || t.sourceURL) + ': ' + t.line + (t.function ? ' (fn: ' + t.function +')' : '')); + msgStack.push(' at ' + (t.file || t.sourceURL) + ': ' + t.line + (t.function ? ' (fn: ' + t.function +')' : '')); }); } diff --git a/test/browser/lib/resurrect.js b/test/lib/resurrect.js similarity index 100% rename from test/browser/lib/resurrect.js rename to test/lib/resurrect.js