From dd11286d6e21d8d17d4a68c7bccb7961037b3e1e Mon Sep 17 00:00:00 2001 From: "Taro Matsuzawa aka. btm" Date: Fri, 11 Mar 2011 11:51:50 +0900 Subject: [PATCH] =?utf8?q?fixtures=E6=BC=8F=E3=82=8C=E3=82=92=E4=BF=AE?= =?utf8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- spec/controllers/admin/styles_controller_spec.rb | 1 + spec/controllers/cart_controller_spec.rb | 2 +- spec/controllers/features_controller_spec.rb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/spec/controllers/admin/styles_controller_spec.rb b/spec/controllers/admin/styles_controller_spec.rb index e230d38..255be45 100644 --- a/spec/controllers/admin/styles_controller_spec.rb +++ b/spec/controllers/admin/styles_controller_spec.rb @@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' describe Admin::StylesController do fixtures :products, :authorities, :functions, :admin_users, :categories, :resource_datas, :image_resources fixtures :styles + fixtures :shops, :retailers before do session[:admin_user] = admin_users(:admin10) diff --git a/spec/controllers/cart_controller_spec.rb b/spec/controllers/cart_controller_spec.rb index b34ed97..51e4e93 100644 --- a/spec/controllers/cart_controller_spec.rb +++ b/spec/controllers/cart_controller_spec.rb @@ -4,7 +4,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe CartController do fixtures :systems, :customers, :carts, :products, :product_styles, :styles, :delivery_traders, :delivery_times, :payments, :delivery_addresses, - :delivery_fees, :order_deliveries, :shops, :payment_plugins + :delivery_fees, :order_deliveries, :shops, :payment_plugins, :retailers before do @dummy_carts = [carts(:cart_can_incriment).attributes] diff --git a/spec/controllers/features_controller_spec.rb b/spec/controllers/features_controller_spec.rb index 8d8ff17..69f6cee 100644 --- a/spec/controllers/features_controller_spec.rb +++ b/spec/controllers/features_controller_spec.rb @@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe FeaturesController do - fixtures :features, :feature_products + fixtures :features, :feature_products, :shops before do @controller.class.skip_before_filter :start_transaction -- 2.11.0