spec調整

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/elecoma/trunk@10 06daa6dd-5c14-464e-8a85-0d68c524be32

diff --git a/spec/controllers/admin/categories_controller_spec.rb b/spec/controllers/admin/categories_controller_spec.rb
index df12d67..9dec653 100644 (file)
--- a/spec/controllers/admin/categories_controller_spec.rb
+++ b/spec/controllers/admin/categories_controller_spec.rb
@@ -109,7 +109,7 @@ describe Admin::CategoriesController do
     it "id 2を削除(通常の削除)" do
       get 'destroy', :id => 2
       Category.find_by_id(2).should be_nil
-      Category.find_by_id(4).position.should == 2
+      Category.find_by_id(4).position.should == 1
     end
     
   end

diff --git a/spec/controllers/admin/features_controller_spec.rb b/spec/controllers/admin/features_controller_spec.rb
index c15f5c0..8353a9a 100644 (file)
--- a/spec/controllers/admin/features_controller_spec.rb
+++ b/spec/controllers/admin/features_controller_spec.rb
@@ -42,7 +42,7 @@ describe Admin::FeaturesController do
       assigns[:feature].dir_name.should == "test"
       assigns[:feature].feature_type.should == 2      
       assigns[:feature].image_resource_id.should_not be_nil
-      assigns[:feature].image_resource_id.should == resource_max + 1
+      assigns[:feature].image_resource_id.should > resource_max
       response.should render_template("admin/features/confirm.html.erb")
       #validateエラーがある場合
       post 'confirm', :feature => {:name => ""}

diff --git a/spec/models/customer_spec.rb b/spec/models/customer_spec.rb
index 5d11528..449ad88 100644 (file)
--- a/spec/models/customer_spec.rb
+++ b/spec/models/customer_spec.rb
@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Customer do
-  fixtures :customers, :zips
+  fixtures :customers, :zips, :constants
 
   before(:each) do
     @customer = customers :valid_signup

diff --git a/spec/models/style_spec.rb b/spec/models/style_spec.rb
index 985030f..5d6ddca 100644 (file)
--- a/spec/models/style_spec.rb
+++ b/spec/models/style_spec.rb
@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Style do
-  fixtures :styles, :style_categories
+  fixtures :styles, :style_categories,:product_styles,:products
   before(:each) do
     @style = styles(:can_incriment)
   end