spec/spree_loader_spec.rb in datashift-0.5.0 vs spec/spree_loader_spec.rb in datashift-0.6.0

@@ -17,21 +17,23 @@
 include DataShift
   
 describe 'SpreeLoader' do
 
       
+  include SpecHelper
+  extend SpecHelper
+      
+      
   before(:all) do
-    SpecHelper::before_all_spree
+    before_all_spree
   end
 
   before(:each) do
 
     begin
     
-      include SpecHelper
-      extend SpecHelper
-      
+     
       before_each_spree
     
       @Product_klass.count.should == 0
       @Taxon_klass.count.should == 0
       @Variant_klass.count.should == 0
@@ -56,27 +58,27 @@
   end
 
 
   it "should process a simple .xls spreadsheet" do
 
-    @zone_klass.delete_all
+    @Zone_klass.delete_all
 
-    loader = ExcelLoader.new(@zone_klass)
+    loader = ExcelLoader.new(@Zone_klass)
     
     loader.perform_load( SpecHelper::spree_fixture('SpreeZoneExample.xls') )
 
-    loader.loaded_count.should == @zone_klass.count
+    loader.loaded_count.should == @Zone_klass.count
   end
 
   it "should process a simple csv file" do
 
-    @zone_klass.delete_all
+    @Zone_klass.delete_all
 
-    loader = CsvLoader.new(@zone_klass)
+    loader = CsvLoader.new(@Zone_klass)
 
     loader.perform_load( SpecHelper::spree_fixture('SpreeZoneExample.csv') )
 
-    loader.loaded_count.should == @zone_klass.count
+    loader.loaded_count.should == @Zone_klass.count
   end
   
 
   # Loader should perform identically regardless of source, whether csv, .xls etc
   
\ No newline at end of file