get layout instance without /meta

clay · Jul 5, 2018 · fa80274 · fa80274
1 parent 451d887
commit fa80274
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/getLayoutInstance/index.js b/lib/getLayoutInstance/index.js
@@ -11,7 +11,7 @@ const isUriStringCheck = require('../strCheck');
  */
 module.exports = function (uri) {
   isUriStringCheck.strCheck(uri);
-  const result = /\/_layouts\/.+?\/instances\/([^\.@]+)/.exec(uri);
+  const result = /\/_layouts\/.+?\/instances\/([^\.\/@]+)/.exec(uri);
 
   return result && result[1];
 };
diff --git a/lib/getLayoutInstance/index.test.js b/lib/getLayoutInstance/index.test.js
@@ -18,7 +18,11 @@ describe('getLayoutInstance', () => {
   });
 
   it('gets instance from full uri', function () {
-    expect(fn('nymag.com/press/_layouts/base/instances/foobarbaz@published')).to.equal('foobarbaz');
+    expect(fn('domain.com/sitepath/_layouts/base/instances/foobarbaz@published')).to.equal('foobarbaz');
+  });
+
+  it('gets instance without meta', function () {
+    expect(fn('domain.com/_layouts/foobar/instances/baz/meta')).to.equal('baz');
   });
 
   it('CANNOT get instance from default uri', function () {