rspecのインストール周りが最近なんだかオカシイので現実的な方法に修正

環境によってテストが通らないケースがあるのを修正
mail送信スクリプトがproductionでエラーになる問題を修正
初期ディレクトリをなるべく用意するように修正

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..06ecd02
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,11 @@
+.DS_Store
+*~
+log/*
+!log/.gitkeep
+tmp/*
+!tmp/.gitkeep
+db/schema.rb
+vendor/plugins/*
+!vendor/plugins/.gitkeep
+var/run/*
+!var/run/.gitkeep

diff --git a/README b/README
index 3dd53f8..4384705 100644 (file)
--- a/README
+++ b/README
@@ -47,8 +47,8 @@ ar_fixtures
   rev: 271
 
 jpmobile
-  git://github.com/darashi/jpmobile.git
-  rev: 256897e357eb48f3be61bdb207ca4eccb2c0d007
+  git://github.com/jpmobile/jpmobile.git
+  rev: tag 0.0.8
 
 jpmobile_emoticon_filter
   http://taslam-plugins.googlecode.com/svn/trunk/jpmobile_emoticon_filter/
@@ -82,6 +82,14 @@ image_submit_tag_ext
   git://github.com/champierre/image_submit_tag_ext.git
   rev: 572ce5ce5d40ee1494ddd0a121483e8791bb2184
 
+rspec
+  git://github.com/dchelimsky/rspec.git
+  rev: tag 1.2.9
+
+rspec-rails
+  git://github.com/dchelimsky/rspec-rails.git
+  rev: tag 1.2.9
+
 ================================================================================
   エレコマ インストール手順
 ================================================================================
@@ -126,7 +134,6 @@ $ unalias sudo
 $ sudo gem install rails -v 2.3.2
 $ sudo gem install gettext -v 2.1.0
 $ sudo gem install gruff -v 0.3.6
-$ sudo gem install rspec-rails -v 1.2.9
 $ wget http://www.artonx.org/data/lhalib/lhalib-0.8.1.gem
 $ sudo gem install lhalib-0.8.1.gem
 $ sudo gem install webmock -v 1.3.4
@@ -214,7 +221,7 @@ $ ruby script/plugin install git://github.com/rails/acts_as_list.git
 $ ruby script/plugin install git://github.com/technoweenie/acts_as_paranoid.git
 $ ruby script/plugin install git://github.com/rails/acts_as_tree.git
 $ ruby script/plugin install http://topfunky.net/svn/plugins/ar_fixtures/
-$ ruby script/plugin install git://github.com/darashi/jpmobile.git
+$ ruby script/plugin install git://github.com/jpmobile/jpmobile.git -r 'tag 0.0.8'
 $ ruby script/plugin install http://taslam-plugins.googlecode.com/svn/trunk/jpmobile_emoticon_filter/
 $ cd vendor/plugins
 $ git clone git://github.com/tmtysk/mbmail.git mbmail
@@ -229,6 +236,8 @@ $ ruby script/plugin install git://github.com/kakutani/yaml_waml.git
 $ ruby script/plugin install git://github.com/rails/ssl_requirement.git
 $ ruby script/plugin install git://github.com/DianthuDia/double_submit_protection.git
 $ ruby script/plugin install git://github.com/champierre/image_submit_tag_ext.git
+$ ruby script/plugin install git://github.com/dchelimsky/rspec-rails.git -r 'tag 1.2.9'
+$ ruby script/plugin install git://github.com/dchelimsky/rspec.git -r 'tag 1.2.9'
 
 13. passengerのインストール
 $ sudo yum install gcc-c++

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index b6f07e4..53c1de6 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/log/.gitkeep b/log/.gitkeep
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/script/mail b/script/mail
index db4a890..c10bd20 100755 (executable)
--- a/script/mail
+++ b/script/mail
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
 # -*- ruby -*-
 
 # メールを
@@ -17,7 +18,9 @@ THRESHOLD = 5
 
 def logger
   l = (ActionMailer::Base.logger || ActionController::Base.logger)
-  l.auto_flushing = true
+  if defined? l.auto_flushing
+    l.auto_flushing = true 
+  end
   l
 end
 

diff --git a/spec/controllers/admin/admin_users_controller_spec.rb b/spec/controllers/admin/admin_users_controller_spec.rb
index e67d261..938164c 100644 (file)
--- a/spec/controllers/admin/admin_users_controller_spec.rb
+++ b/spec/controllers/admin/admin_users_controller_spec.rb
@@ -2,7 +2,7 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Admin::AdminUsersController do
-  fixtures :admin_users
+  fixtures :admin_users, :retailers
 
   before do
     session[:admin_user] = admin_users(:admin10)

diff --git a/spec/controllers/admin/mail_magazines_controller_spec.rb b/spec/controllers/admin/mail_magazines_controller_spec.rb
index 8571dbc..cc9573b 100644 (file)
--- a/spec/controllers/admin/mail_magazines_controller_spec.rb
+++ b/spec/controllers/admin/mail_magazines_controller_spec.rb
@@ -1,7 +1,8 @@
+# -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Admin::MailMagazinesController do
-  fixtures :authorities, :functions, :admin_users, :mail_magazine_templates, :customers, :mail_magazines
+  fixtures :authorities, :functions, :admin_users, :mail_magazine_templates, :customers, :mail_magazines, :mails
   fixtures :orders, :order_deliveries, :order_details
   fixtures :campaigns_customers
 

diff --git a/spec/controllers/admin/orders_controller_spec.rb b/spec/controllers/admin/orders_controller_spec.rb
index 1ea0e78..69f2080 100644 (file)
--- a/spec/controllers/admin/orders_controller_spec.rb
+++ b/spec/controllers/admin/orders_controller_spec.rb
@@ -20,6 +20,7 @@ describe Admin::OrdersController, "/admin/order" do
   fixtures :functions, :authorities, :authorities_functions
   fixtures :products
   fixtures :retailers
+  fixtures :customers
 
   before do
     @order = orders(:one)

diff --git a/spec/controllers/admin/shops_controller_spec.rb b/spec/controllers/admin/shops_controller_spec.rb
index 3c8f941..7311d47 100644 (file)
--- a/spec/controllers/admin/shops_controller_spec.rb
+++ b/spec/controllers/admin/shops_controller_spec.rb
@@ -2,7 +2,7 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Admin::ShopsController do
-  fixtures :authorities, :functions, :admin_users , :shops, :retailers
+  fixtures :authorities, :functions, :admin_users , :shops, :retailers, :delivery_traders, :delivery_times
   
   before(:each) do
     session[:admin_user] = admin_users(:load_by_admin_user_test_id_1)

diff --git a/spec/fixtures/delivery_times.yml b/spec/fixtures/delivery_times.yml
index a4cadff..9ed0407 100644 (file)
--- a/spec/fixtures/delivery_times.yml
+++ b/spec/fixtures/delivery_times.yml
@@ -33,7 +33,7 @@ delivery_time_<%=idx%>:
 delivery_time_<%=idx%>:
   id: <%= idx %>
   position: <%=idx%>
-  name: 
+  name: a<%= idx %>
   delivery_trader_id: <%= trader %>
 <% end %>
 <% end %>

diff --git a/spec/models/payment_spec.rb b/spec/models/payment_spec.rb
index d333e72..80c17a2 100644 (file)
--- a/spec/models/payment_spec.rb
+++ b/spec/models/payment_spec.rb
@@ -2,7 +2,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Payment do
-  fixtures :payments
+  fixtures :payments, :payment_plugins
   
   before(:each) do
     @payment = payments :cash

diff --git a/tmp/.gitkeep b/tmp/.gitkeep
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/var/run/.gitkeep b/var/run/.gitkeep
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/vendor/plugins/.gitkeep b/vendor/plugins/.gitkeep
new file mode 100644 (file)
index 0000000..e69de29