Created aoi_question factory to simplify spec setup code

Dhruv Kapadia
1 parent 439818b8
Showing 5 changed files with 36 additions and 32 deletions Show diff stats
app/models/question.rb
spec/controllers/questions_controller_spec.rb
spec/factories.rb
spec/models/question_spec.rb
test/factories.rb
@@ -24,7 +24,7 @@ class Question &lt; ActiveRecord::Base
   attr_accessor :ideas
   after_create :create_choices_from_ideas
   def create_choices_from_ideas
-    if ideas.any?
+    if ideas && ideas.any?
       ideas.each do |idea|
         item = Item.create!(:data => idea.squish.strip, :creator => self.creator)
 	choices.create!(:item => item, :creator => self.creator, :active => true, :data => idea.squish.strip)
@@ -2,23 +2,22 @@ require File.expand_path(File.dirname(__FILE__) + &#39;/../spec_helper&#39;)
 describe QuestionsController do
-  # integrate_views
-  #   
      def sign_in_as(user)
        @controller.current_user = user
        return user
      end
-  #   
+
      before(:each) do
-        @user = Factory.create(:user, :email => "pius@alum.mit.edu", :password => "password", :password_confirmation => "password", :id => 8)
-        sign_in_as(@user = Factory(:email_confirmed_user))
-        @question = @user.create_question("foobarbaz", {:name => 'foo'})
+        @question = Factory.create(:aoi_question)
+        sign_in_as(@user = @question.site)
+	@creator = @question.creator
      end
      it "responds with basic question information" do
          get :show, :id => @question.id, :format => "xml"
          assigns[:question].should == @question
 	 @response.body.should have_tag("question")
+	 @response.code.should == "200"
      end
@@ -27,6 +26,7 @@ describe QuestionsController do
          assigns[:question].should == @question
 	 #@response.body.should be_nil
+	 @response.code.should == "200"
 	 @response.body.should have_tag("question")
 	 @response.body.should have_tag("picked_prompt_id")
 	 @response.body.should have_tag("appearance_id")
@@ -2,17 +2,31 @@ Factory.define(:item) do |f|
   f.sequence(:data) { |i| "Item #{i}" }
 end
+
 Factory.define(:question) do |f|
   f.sequence(:name) { |i| "Name #{i}" }
+  f.site {|s| s.association(:user)}
+  f.creator {|c| c.association(:visitor, :site => c.site)}
 end
 Factory.define(:aoi_question, :parent => :question) do |f|
   f.sequence(:name) { |i| "Name #{i}" }
   f.association :site, :factory => :user
-  f.association :creator, :factory => :visitor
+  f.creator {|c| c.association(:visitor, :site => c.site)}
+  f.choices do |question|
+	      result = []
+	      2.times do 
+		result << Factory.build(:choice, 
+					:question => question.result,
+					:creator => question.creator,
+					:active => true)
+	      end
+	     result
+	    end
 end
 Factory.define(:visitor) do |f|
   f.sequence(:identifier) { |i| "Identifier #{i}" }
+  f.association :site, :factory => :user
 end
 Factory.define(:prompt) do |f|
@@ -21,6 +35,8 @@ end
 Factory.define(:choice) do |f|
   f.sequence(:data) { |i| "Choice: #{i}" }
+  f.association :question
+  f.creator {|c| c.association(:visitor, :site => c.question.site)}
 end
 Factory.sequence :email do |n|
@@ -13,24 +13,10 @@ describe Question do
   it {should validate_presence_of :creator}
   before(:each) do
-    @aoi_clone = Factory.create(:user,:password => "password", :password_confirmation => "password", :id => 8)
-    @valid_attributes = {
-      :site => @aoi_clone,
-      :creator => @aoi_clone.default_visitor
-      
-    }
+   
+    @question = Factory.create(:aoi_question)
+    @aoi_clone = @question.site
-    @question = @aoi_clone.create_question("foobarbaz", {:name => 'foo'})
-    @question.it_should_autoactivate_ideas = true
-    @question.save!
-
-    2.times.each do |num|
-       @aoi_clone.create_choice("visitor identifier", @question, {:data => num.to_s, :local_identifier => "example"})
-    end
-
-    @question.reload
-
-    
   end
   it "should have 2 active choices" do
@@ -38,7 +24,8 @@ describe Question do
   end
   it "should create a new instance given valid attributes" do
-    Question.create!(@valid_attributes)
+    # Factory.attributes_for does not return associations, this is a good enough substitute
+    Question.create!(Factory.build(:question).attributes.symbolize_keys)
   end
   it "should not create two default choices if none are provided" do
@@ -116,15 +103,15 @@ describe Question do
   context "catchup algorithm" do 
 	  before(:all) do
-		  user = Factory.create(:user)
-		  @catchup_q = Factory.create(:aoi_question, :site => user, :creator => user.default_visitor)
+		  @catchup_q = Factory.create(:aoi_question)
 		  @catchup_q.it_should_autoactivate_ideas = true
 		  @catchup_q.uses_catchup = true
 		  @catchup_q.save!
-		  100.times.each do |num|
-			  user.create_choice("visitor identifier", @catchup_q, {:data => num.to_s, :local_identifier => "exmaple"})
+		  # 2 ideas already exist, so this will make an even hundred
+		  98.times.each do |num|
+			  @catchup_q.site.create_choice("visitor identifier", @catchup_q, {:data => num.to_s, :local_identifier => "exmaple"})
 		  end
 		  @catchup_q.reload
 	  end
@@ -202,8 +189,9 @@ describe Question do
   context "exporting data" do
 	  before(:all) do
-		  user = Factory.create(:user)
-		  @question = Factory.create(:aoi_question, :site => user, :creator => user.default_visitor)
+		  @question = Factory.create(:aoi_question)
+		  user = @question.site
+
 		  @question.it_should_autoactivate_ideas = true
 		  @question.save!
	@@ -24,7 +24,7 @@ class Question < ActiveRecord::Base		@@ -24,7 +24,7 @@ class Question < ActiveRecord::Base
24	attr_accessor :ideas	24	attr_accessor :ideas
25	after_create :create_choices_from_ideas	25	after_create :create_choices_from_ideas
26	def create_choices_from_ideas	26	def create_choices_from_ideas
27	- if ideas.any?	27	+ if ideas && ideas.any?
28	ideas.each do \|idea\|	28	ideas.each do \|idea\|
29	item = Item.create!(:data => idea.squish.strip, :creator => self.creator)	29	item = Item.create!(:data => idea.squish.strip, :creator => self.creator)
30	choices.create!(:item => item, :creator => self.creator, :active => true, :data => idea.squish.strip)	30	choices.create!(:item => item, :creator => self.creator, :active => true, :data => idea.squish.strip)
	@@ -2,17 +2,31 @@ Factory.define(:item) do \|f\|		@@ -2,17 +2,31 @@ Factory.define(:item) do \|f\|
2	f.sequence(:data) { \|i\| "Item #{i}" }	2	f.sequence(:data) { \|i\| "Item #{i}" }
3	end	3	end
4		4
		5	+
5	Factory.define(:question) do \|f\|	6	Factory.define(:question) do \|f\|
6	f.sequence(:name) { \|i\| "Name #{i}" }	7	f.sequence(:name) { \|i\| "Name #{i}" }
		8	+ f.site {\|s\| s.association(:user)}
		9	+ f.creator {\|c\| c.association(:visitor, :site => c.site)}
7	end	10	end
8	Factory.define(:aoi_question, :parent => :question) do \|f\|	11	Factory.define(:aoi_question, :parent => :question) do \|f\|
9	f.sequence(:name) { \|i\| "Name #{i}" }	12	f.sequence(:name) { \|i\| "Name #{i}" }
10	f.association :site, :factory => :user	13	f.association :site, :factory => :user
11	- f.association :creator, :factory => :visitor	14	+ f.creator {\|c\| c.association(:visitor, :site => c.site)}
		15	+ f.choices do \|question\|
		16	+ result = []
		17	+ 2.times do
		18	+ result << Factory.build(:choice,
		19	+ :question => question.result,
		20	+ :creator => question.creator,
		21	+ :active => true)
		22	+ end
		23	+ result
		24	+ end
12	end	25	end
13		26
14	Factory.define(:visitor) do \|f\|	27	Factory.define(:visitor) do \|f\|
15	f.sequence(:identifier) { \|i\| "Identifier #{i}" }	28	f.sequence(:identifier) { \|i\| "Identifier #{i}" }
		29	+ f.association :site, :factory => :user
16	end	30	end
17		31
18	Factory.define(:prompt) do \|f\|	32	Factory.define(:prompt) do \|f\|
	@@ -21,6 +35,8 @@ end		@@ -21,6 +35,8 @@ end
21		35
22	Factory.define(:choice) do \|f\|	36	Factory.define(:choice) do \|f\|
23	f.sequence(:data) { \|i\| "Choice: #{i}" }	37	f.sequence(:data) { \|i\| "Choice: #{i}" }
		38	+ f.association :question
		39	+ f.creator {\|c\| c.association(:visitor, :site => c.question.site)}
24	end	40	end
25		41
26	Factory.sequence :email do \|n\|	42	Factory.sequence :email do \|n\|