fixtures漏れを全て修正

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 53c1de6..cac9d0d 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -46,7 +46,7 @@ class ApplicationController < ActionController::Base
   private
   #sslの有効無効をuse_sslで決定する
   def ensure_proper_protocol
-    return true unless @system #specでload_systemが通らない問題に対応するため
+    # return true unless @system #specでload_systemが通らない問題に対応するため
     #return false
     return true unless @system.use_ssl
     return true if ssl_allowed?

diff --git a/spec/controllers/accounts_controller_spec.rb b/spec/controllers/accounts_controller_spec.rb
index 2b84a99..323303a 100644 (file)
--- a/spec/controllers/accounts_controller_spec.rb
+++ b/spec/controllers/accounts_controller_spec.rb
@@ -2,7 +2,7 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe AccountsController do
-  fixtures :customers, :kiyakus, :carts, :product_styles, :products, :delivery_addresses, :campaigns
+  fixtures :customers, :kiyakus, :carts, :product_styles, :products, :delivery_addresses, :campaigns, :shops
 
   before do
     @controller.class.skip_before_filter :start_transaction

diff --git a/spec/controllers/admin/categories_controller_spec.rb b/spec/controllers/admin/categories_controller_spec.rb
index 2cc92c5..bb915ba 100644 (file)
--- a/spec/controllers/admin/categories_controller_spec.rb
+++ b/spec/controllers/admin/categories_controller_spec.rb
@@ -1,8 +1,10 @@
+# -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Admin::CategoriesController do
   fixtures :admin_users
   fixtures :categories
+  fixtures :shops
 
   before do
     session[:admin_user] = admin_users(:admin10)

diff --git a/spec/controllers/admin/home_controller_spec.rb b/spec/controllers/admin/home_controller_spec.rb
index 25e37cd..e49e671 100644 (file)
--- a/spec/controllers/admin/home_controller_spec.rb
+++ b/spec/controllers/admin/home_controller_spec.rb
@@ -1,7 +1,8 @@
+# -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Admin::HomeController do
-  fixtures :admin_users, :customers, :order_deliveries
+  fixtures :admin_users, :customers, :order_deliveries, :shops
   before(:each) do
     session[:admin_user] = admin_users(:load_by_admin_user_test_id_1)
   end

diff --git a/spec/controllers/admin/mail_magazine_templates_controller_spec.rb b/spec/controllers/admin/mail_magazine_templates_controller_spec.rb
index 6040116..665e142 100644 (file)
--- a/spec/controllers/admin/mail_magazine_templates_controller_spec.rb
+++ b/spec/controllers/admin/mail_magazine_templates_controller_spec.rb
@@ -2,7 +2,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Admin::MailMagazineTemplatesController do
-  fixtures :mail_magazine_templates, :admin_users
+  fixtures :mail_magazine_templates, :admin_users, :shops
 
   before do
     session[:admin_user] = admin_users(:admin10)

diff --git a/spec/controllers/admin/retailers_controller_spec.rb b/spec/controllers/admin/retailers_controller_spec.rb
index 95689e0..ff117b5 100644 (file)
--- a/spec/controllers/admin/retailers_controller_spec.rb
+++ b/spec/controllers/admin/retailers_controller_spec.rb
@@ -1,7 +1,8 @@
+# -*- coding: utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Admin::RetailersController do
-  fixtures :admin_users, :retailers
+  fixtures :admin_users, :retailers, :shops
 
   before do
     @main_shop = admin_users(:load_by_admin_user_test_id_1)