Merge pull request #53 from vivekprahlad/master

Fix for broken build
neo4jrb · Oct 4, 2011 · 3a4b777 · 3a4b777
2 parents d37ddb6 + 418e428
commit 3a4b777
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 20 deletions.
diff --git a/spec/rails/active_record_style_relationships_spec.rb b/spec/rails/active_record_style_relationships_spec.rb
@@ -7,9 +7,6 @@ class ModelRelationship1 < Neo4j::Rails::Relationship
   end
 
   before(:each) do
-    Neo4j::Transaction.run do
-      Neo4j::Index::IndexerRegistry.delete_all_indexes
-    end
     @actor_class = create_model(Neo4j::Model)
     @actor_class.property :name
     @actor_class.property :description

diff --git a/spec/rails/model_spec.rb b/spec/rails/model_spec.rb
@@ -3,12 +3,6 @@
 # Specs written by Nick Sieger and modified by Andreas Ronge
 
 describe Neo4j::Model do
-  before(:each) do
-    Neo4j::Transaction.run do
-      Neo4j::Index::IndexerRegistry.delete_all_indexes
-    end
-  end
-
   describe "new" do
     before :each do
       @model = Neo4j::Model.new

diff --git a/spec/rails/relationship_spec.rb b/spec/rails/relationship_spec.rb
@@ -620,10 +620,6 @@ def reject_posts(attributed)
 
   context "when there's lots of them" do
     before(:each) do
-      Neo4j::Transaction.run do
-        Neo4j::Index::IndexerRegistry.delete_all_indexes
-      end
-
       subject.class.create!(:foo, @start_node, @end_node)
       subject.class.create!(:foo, @start_node, @end_node)
       subject.class.create!(:foo, @start_node, @end_node)
@@ -671,9 +667,6 @@ def mark_saved
 
 describe RelationshipWithProperty do
   before(:each) do
-    Neo4j::Transaction.run do
-      Neo4j::Index::IndexerRegistry.delete_all_indexes
-    end
     @start_node = Neo4j::Model.new
     @end_node = Neo4j::Model.new
   end

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -51,22 +51,22 @@ def new_tx
 
   RSpec.configure do |c|
     $name_counter = 0
-  #c.filter = { :type => :problem}
+
     c.before(:each, :type => :transactional) do
       new_tx
     end
 
     c.after(:each, :type => :transactional) do
       finish_tx
       Neo4j::Rails::Model.close_lucene_connections
-      Neo4j::Transaction.run do
-        Neo4j::Index::IndexerRegistry.delete_all_indexes
-      end
     end
 
     c.after(:each) do
       finish_tx
       Neo4j::Rails::Model.close_lucene_connections
+      Neo4j::Transaction.run do
+        Neo4j::Index::IndexerRegistry.delete_all_indexes
+      end
       Neo4j::Transaction.run do
         Neo4j.threadlocal_ref_node = Neo4j::Node.new :name => "ref_#{$name_counter}"
         $name_counter += 1