feat(template): edge.share now merges locals

edge-js · Jun 21, 2017 · 7402af4 · 7402af4
1 parent 7ddbb1e
commit 7402af4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/examples/views/withlayouts/index.edge b/examples/views/withlayouts/index.edge
@@ -3,4 +3,4 @@
   <h1 class="display-3">Jumbotron heading</h1>
   <p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
   <p><a class="btn btn-lg btn-success" href="#" role="button">Sign up today</a></p>
-@endsection
+@endsection
diff --git a/src/Template/index.js b/src/Template/index.js
@@ -252,7 +252,7 @@ class Template {
    * @chainable
    */
   share (locals) {
-    this._locals = locals
+    _.merge(this._locals, locals)
     return this
   }
 

diff --git a/test/unit/edge.spec.js b/test/unit/edge.spec.js
@@ -258,4 +258,13 @@ test.group('Edge', (group) => {
     const statement = `{{ size('foo') }}`
     assert.equal(edge.renderString(statement).trim(), '3')
   })
+
+  test('merge locals shared for multiple times', (assert) => {
+    const edge = new Edge()
+    const sharedInstance = edge.share({ foo: 'bar' })
+    sharedInstance.share({ bar: 'baz' })
+
+    const statement = `{{ foo }} {{ bar }}`
+    assert.equal(sharedInstance.renderString(statement).trim(), 'bar baz')
+  })
 })