[DRE-commits] [SCM] ruby-shoulda-matchers.git branch, master, updated. debian/1.0.0_beta2-1-22-g370d57a

[Praveen Arimbrathodiyil]

The following commit has been merged in the master branch:
commit 370d57a953801aaf9062a6bfdb0c979637a19f63
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Jun 5 01:29:11 2013 +0530

    add patch from Sam Ruby to fix config path

diff --git a/debian/patches/fix-config-path.patch b/debian/patches/fix-config-path.patch
new file mode 100644
index 0000000..f7c953b
--- /dev/null
+++ b/debian/patches/fix-config-path.patch
@@ -0,0 +1,19 @@
+Description: Fix config path for testapp
+ tests were looking at shoulda-matchers root instead of testapp root
+Source: https://lists.debian.org/debian-ruby/2013/06/msg00053.html
+Author: Sam Ruby <rubys at intertwingly.net>
+Last-Update: 2013-06-04
+
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index ae12d95..eed43b9 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -6,7 +6,7 @@ FileUtils.rm_rf(TESTAPP_ROOT) if File.exists?(TESTAPP_ROOT)
+ ENV['RAILS_ENV'] = 'test'
+ ENV['BUNDLE_GEMFILE'] ||= TESTAPP_ROOT + '/Gemfile'
+
+-require "#{TESTAPP_ROOT}/config/environment"
++Dir.chdir(TESTAPP_ROOT) { require "./config/environment" }
+ require 'bourne'
+ require 'shoulda-matchers'
+ require 'rspec/rails'
diff --git a/debian/patches/series b/debian/patches/series
index e3ee4d1..6deaab3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+fix-config-path.patch
 remove-gemfile-lock.patch

-- 
ruby-shoulda-matchers.git