From aa26adf980d1f118a005823ea5db55a95b283635 Mon Sep 17 00:00:00 2001 From: Simon Hunt Date: Tue, 20 Jan 2015 10:32:49 -0800 Subject: [PATCH] GUI -- Corrected path prefix for ui/rs calls. - fixed broken unit tests. Change-Id: I52c3f54853a19d7d7d46a7453f540b241593d138 --- web/gui/src/main/webapp/app/fw/remote/rest.js | 2 +- web/gui/src/main/webapp/tests/app/fw/remote/rest-spec.js | 3 ++- web/gui/src/main/webapp/tests/app/fw/svg/glyph-spec.js | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/web/gui/src/main/webapp/app/fw/remote/rest.js b/web/gui/src/main/webapp/app/fw/remote/rest.js index eeca1f4d94..9361afc2ce 100644 --- a/web/gui/src/main/webapp/app/fw/remote/rest.js +++ b/web/gui/src/main/webapp/app/fw/remote/rest.js @@ -22,7 +22,7 @@ var $log; - var urlSuffix = '/ui/rs/'; + var urlSuffix = '/onos/ui/rs/'; diff --git a/web/gui/src/main/webapp/tests/app/fw/remote/rest-spec.js b/web/gui/src/main/webapp/tests/app/fw/remote/rest-spec.js index b3d514c34c..55e22782ad 100644 --- a/web/gui/src/main/webapp/tests/app/fw/remote/rest-spec.js +++ b/web/gui/src/main/webapp/tests/app/fw/remote/rest-spec.js @@ -90,7 +90,8 @@ describe('factory: fw/remote/rest.js', function() { expect(called).toEqual(0); expect(capture).toBeNull(); expect($log.warn).toHaveBeenCalledWith( - 'Failed to retrieve JSON data: http://foo:80/ui/rs/bar', 404, 'Not Found'); + 'Failed to retrieve JSON data: http://foo:80/onos/ui/rs/bar', + 404, 'Not Found'); }); }); diff --git a/web/gui/src/main/webapp/tests/app/fw/svg/glyph-spec.js b/web/gui/src/main/webapp/tests/app/fw/svg/glyph-spec.js index 353fc78286..587d617b63 100644 --- a/web/gui/src/main/webapp/tests/app/fw/svg/glyph-spec.js +++ b/web/gui/src/main/webapp/tests/app/fw/svg/glyph-spec.js @@ -36,8 +36,8 @@ describe('factory: fw/svg/glyph.js', function() { chain: 'M60.4,77.6c-', crown: 'M99.5,21.6c0,', uiAttached: 'M2,2.5a.5,.5', - checkMark: 'M2.644,4.531c0', - xMark: 'M8.967,7.196C8.172', + checkMark: 'M2.6,4.5c0', + xMark: 'M9.0,7.2C8.2', // our test ones.. triangle: 'M.5,.2',