moved specs, created spec_utils

robertbrook · Apr 24, 2008 · 14ab2df · 14ab2df
1 parent 0909a29
commit 14ab2df
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 8 deletions.
diff --git a/spec/answer_groups_spec.rb → spec/lib/answer_groups_spec.rb b/spec/answer_groups_spec.rb → spec/lib/answer_groups_spec.rb
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../lib/questions'
-require File.dirname(__FILE__) + '/../lib/answers'
-require File.dirname(__FILE__) + '/../lib/answer_groups'
+require File.dirname(__FILE__) + '/../../lib/questions'
+require File.dirname(__FILE__) + '/../../lib/answers'
+require File.dirname(__FILE__) + '/../../lib/answer_groups'
 require File.dirname(__FILE__) + '/answers_spec_data'
 
 describe AnswerGroups, 'when creating' do

diff --git a/spec/answers_spec.rb → spec/lib/answers_spec.rb b/spec/answers_spec.rb → spec/lib/answers_spec.rb
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../lib/questions'
-require File.dirname(__FILE__) + '/../lib/answers'
-require File.dirname(__FILE__) + '/../lib/answer_groups'
+require File.dirname(__FILE__) + '/../../lib/questions'
+require File.dirname(__FILE__) + '/../../lib/answers'
+require File.dirname(__FILE__) + '/../../lib/answer_groups'
 require File.dirname(__FILE__) + '/answers_spec_data'
 
 describe Answers, 'when creating' do

diff --git a/spec/answers_spec_data.rb → spec/lib/answers_spec_data.rb b/spec/answers_spec_data.rb → spec/lib/answers_spec_data.rb
diff --git a/spec/questions_spec.rb → spec/lib/questions_spec.rb b/spec/questions_spec.rb → spec/lib/questions_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../lib/questions'
+require File.dirname(__FILE__) + '/../../lib/questions'
 require File.dirname(__FILE__) + '/answers_spec_data'
 require 'hpricot'
 

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -4,6 +4,7 @@
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
 require 'spec'
 require 'spec/rails'
+require File.expand_path(File.dirname(__FILE__) + "/spec_utils.rb")
 
 Spec::Runner.configure do |config|
   # If you're not using ActiveRecord you should remove these
@@ -42,6 +43,6 @@
   # config.mock_with :rr
   #
   # == Notes
-  # 
+  #
   # For more information take a look at Spec::Example::Configuration and Spec::Runner
 end
diff --git a/spec/spec_utils.rb b/spec/spec_utils.rb
@@ -0,0 +1,11 @@
+
+# e.g. assert_model_has_many Answer, :questions
+def assert_model_has_many(model, association_name)
+  association = model.reflect_on_association(association_name.to_sym)
+  assert_not_nil association, "Could not find an association for #{association_name}"
+
+  assert_equal :has_many, association.macro
+
+  assert association.klass.column_names.include?(association.primary_key_name)
+end
+