Merge pull request maxdemarzi#91 from kamranjon/integration

fixing eager loading bug
willkessler · Jan 14, 2014 · fcb4738 · fcb4738
2 parents 0274ba0 + be0ddae
commit fcb4738
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/deja/query.rb b/lib/deja/query.rb
@@ -4,7 +4,7 @@ class Query
 
     class << self
       def load_node(neo_id, options = {})
-        options[:return_root] ||= :root_only
+        options[:return_root] = options[:include] ? :root_rel_end : :root_only
         options[:include] ||= :none
         cypher_query = Deja::Bridge.get_nodes(neo_id, options)
         result_hash  = Deja.execute_cypher(cypher_query)

diff --git a/spec/node_spec.rb b/spec/node_spec.rb
@@ -64,8 +64,8 @@ class HasHate < Relationship; end
         @node.permalink.should eq(@first_node.permalink)
       end
 
-      it "calling invested_in should call related_nodes" do
-        @node.should_receive(:related_nodes).and_call_original
+      it "calling invested_in should not call related_nodes" do
+        @node.should_not_receive(:related_nodes).and_call_original
         @node.investment
       end