Merge branch 'release/0.5' into develop

2 files changed, 8 insertions, 8 deletions

diff --git a/script/load-sample-data b/script/load-sample-data
index 84b8a28eb..92846ce17 100755
--- a/script/load-sample-data
+++ b/script/load-sample-data
@@ -4,17 +4,16 @@
 # the fact that the fixtures aren't aware of the fact that RawEmails
 # have a filesystem representation of their contents
 
-LOC=`dirname $0`
+LOC=`dirname "$0"`
+
 rake --silent spec:db:fixtures:load
+
 "$LOC/runner" /dev/stdin <<END
 env = ENV["RAILS_ENV"]
-require "spec/spec_helper.rb" # Sets RAILS_ENV to 'test'
-ENV["RAILS_ENV"] = env
+require "spec/spec_helper.rb" # this sets RAILS_ENV to 'test'
+ENV["RAILS_ENV"] = env        # so restore to what it was before
 
-RawEmail.all().each do |email|
-    puts "Writing #{email.filepath}"
-    email.data = load_file_fixture("useless_raw_email.email")
-end
+load_raw_emails_data
 END
 
 echo "Loaded fixtures."
diff --git a/script/spec-all-pairs b/script/spec-all-pairs
index 6f27e6b8e..338f56147 100755
--- a/script/spec-all-pairs
+++ b/script/spec-all-pairs
@@ -41,6 +41,7 @@ pairs_from_stdin() {
     do
         case "$line" in
         \*\ FAILED:\ *)
+        spec/*.rb spec/$.rb)
           line=${line#\* FAILED: }
           if ! test_pair $line
           then
@@ -63,4 +64,4 @@ then
 else
     all_pairs
 fi
-exit $?
\ No newline at end of file
+exit $?