From acc8803cee2022d098cd997822411164f3af26e0 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Fri, 3 Dec 2010 16:33:28 +0100
Subject: [PATCH] try at fixing specs for ruby 1.9, SystemTimer isn't needed
 anymore for 1.9

---
 Gemfile                                 | 2 +-
 spec/models/jobs/receive_salmon_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index d027c6f12..4a0949787 100644
--- a/Gemfile
+++ b/Gemfile
@@ -54,7 +54,7 @@ gem "cloudfiles", :require => false
 
 #Queue
 gem 'resque'
-gem 'SystemTimer'
+gem 'SystemTimer' unless RUBY_VERSION.include? "1.9"
 
 group :test, :development do
   gem 'factory_girl_rails'
diff --git a/spec/models/jobs/receive_salmon_spec.rb b/spec/models/jobs/receive_salmon_spec.rb
index c4e66fffe..7a5df6a4b 100644
--- a/spec/models/jobs/receive_salmon_spec.rb
+++ b/spec/models/jobs/receive_salmon_spec.rb
@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Jobs::ReceiveSalmon do
   before do