テスト安定化

diff --git a/spec/controllers/base_controller_spec.rb b/spec/controllers/base_controller_spec.rb
index 485f587..748b1c7 100644 (file)
--- a/spec/controllers/base_controller_spec.rb
+++ b/spec/controllers/base_controller_spec.rb
@@ -14,7 +14,7 @@ class DummyController < BaseController
 end
 
 describe BaseController do
-  fixtures :carts, :customers, :shops
+  fixtures :carts, :customers, :shops, :product_styles
 
   before do
     @controller.class.skip_before_filter :start_transaction
@@ -27,7 +27,7 @@ describe BaseController do
   end
 
   describe "cart_total_prices" do
-    it "" do
+    it "should have products with any prices in a cart " do
       carts = customers(:have_cart_user).carts
       result = controller.cart_total_prices carts
       result.should > 0

diff --git a/spec/controllers/products_controller_spec.rb b/spec/controllers/products_controller_spec.rb
index 80f55f4..34cb214 100644 (file)
--- a/spec/controllers/products_controller_spec.rb
+++ b/spec/controllers/products_controller_spec.rb
@@ -2,7 +2,7 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe ProductsController do
-  fixtures :products, :categories, :seos, :product_styles, :styles, :style_categories
+  fixtures :products, :categories, :seos, :product_styles, :styles, :style_categories, :shops
 
   before do
   end

diff --git a/spec/models/notifier_spec.rb b/spec/models/notifier_spec.rb
index 89dbb40..440f2d1 100644 (file)
--- a/spec/models/notifier_spec.rb
+++ b/spec/models/notifier_spec.rb
@@ -5,6 +5,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe Notifier do
   fixtures :shops, :customers, :inquiries,:mail_templates
   fixtures :orders, :order_deliveries, :order_details, :payments, :prefectures
+  fixtures :products, :product_styles, :style_categories
   before(:each) do
     @shop = Shop.find(:first)
   end

diff --git a/spec/models/order_delivery_spec.rb b/spec/models/order_delivery_spec.rb
index 7d0cee7..018e036 100644 (file)
--- a/spec/models/order_delivery_spec.rb
+++ b/spec/models/order_delivery_spec.rb
@@ -3,6 +3,8 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe OrderDelivery do
   fixtures :orders, :order_details,:order_deliveries, :prefectures,:payments,:delivery_times,:delivery_traders,:occupations,:delivery_tickets  
+  fixtures :products, :product_styles
+
   before(:each) do
     #会員
     @order_delivery = order_deliveries(:customer_buy_two)