Merge branch 'fixSpecBug'

Dhruv Kapadia
2 parents 629c4b02 a36f7203
Showing 9 changed files with 75 additions and 89 deletions Show diff stats
spec/controllers/prompts_controller_spec.rb
spec/controllers/questions_controller_spec.rb
spec/factories.rb
spec/models/choice_spec.rb
spec/models/prompt_spec.rb
spec/models/question_spec.rb
spec/models/user_spec.rb
spec/models/visitor_spec.rb
test/factories.rb
@@ -7,13 +7,9 @@ describe PromptsController do
    end
   #   
    before(:each) do
-    @aoi_clone = Factory.create(:user)
-    sign_in_as(@user = Factory(:email_confirmed_user))
-    @johndoe = Factory.create(:visitor, :identifier => 'johndoe', :site => @aoi_clone)
-    @question = Factory.create(:question, :name => 'which do you like better?', :site => @aoi_clone, :creator => @aoi_clone.default_visitor)
-    @lc = Factory.create(:choice, :question => @question, :creator => @johndoe, :data => 'hello gorgeous')
-    @rc = Factory.create(:choice, :question => @question, :creator => @johndoe, :data => 'goodbye gorgeous')
-    @prompt = Factory.create(:prompt, :question => @question, :tracking => 'sample', :left_choice => @lc, :right_choice => @rc)
+    @question = Factory.create(:aoi_question)
+    sign_in_as(@aoi_clone = @question.site)
+    @prompt = @question.prompts.first
     @visitor = @aoi_clone.visitors.find_or_create_by_identifier("test_visitor_identifier")
     @appearance = @aoi_clone.record_appearance(@visitor, @prompt)
@@ -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|
@@ -8,12 +8,14 @@ describe Choice do
   it {should validate_presence_of :question}
   before(:each) do
-    @aoi_clone = Factory.create(:user, :email => "pius@alum.mit.edu", :password => "password", :password_confirmation => "password", :id => 8)
-    @johndoe = Factory.create(:visitor, :identifier => 'johndoe', :site => @aoi_clone)
-    @question = Question.create(:name => 'which do you like better?', :site => @aoi_clone, :creator => @johndoe)
+    @aoi_clone = Factory.create(:email_confirmed_user)
+    @visitor= Factory.create(:visitor, :site => @aoi_clone)
+    @question = Question.create(:name => 'which do you like better?', 
+				:site => @aoi_clone, 
+				:creator => @visitor)
     @valid_attributes = {
-      :creator => @johndoe,
+      :creator => @visitor,
       :question => @question,
       :data => 'hi there'
     }
@@ -23,11 +25,11 @@ describe Choice do
     Choice.create!(@valid_attributes)
   end
-  it "should generate prompts after creation" do
-    prev_choices = @question.choices.size
-    @question.prompts.should_not be_empty
-    proc {choice1 = Choice.create!(@valid_attributes.merge(:data => '1234'))}.should change(@question.prompts, :count).by(prev_choices*2)
-    @question.prompts.should_not be_empty
+  it "should generate prompts after two choices are created" do
+    proc {
+	  choice1 = Choice.create!(@valid_attributes.merge(:data => '1234'))
+          choice2 = Choice.create!(@valid_attributes.merge(:data => '1234'))
+    }.should change(@question.prompts, :count).by(2)
   end
   it "should deactivate a choice" do
@@ -37,10 +39,13 @@ describe Choice do
   end
   it "should update a question's counter cache on creation" do
-	  @question.choices.size.should == 2
-          choice1 = Choice.create!(@valid_attributes.merge(:data => '1234'))
+	  @question.choices_count.should == 0
+	  @question.choices.size.should == 0
+          Choice.create!(@valid_attributes.merge(:data => '1234'))
 	  @question.reload
-	  @question.choices.size.should == 3
+	  @question.choices_count.should == 1
+	  @question.choices.size.should == 1
+	
   end
   it "should update a question's counter cache on activation" do
@@ -5,22 +5,4 @@ describe Prompt do
   it {should belong_to :left_choice}
   it {should belong_to :right_choice}
-  before(:each) do
-    @aoi_clone = Factory.create(:user, :email => "pius@alum.mit.edu", :password => "password", :password_confirmation => "password", :id => 8)
-    @johndoe = Factory.create(:visitor, :identifier => 'johndoe', :site => @aoi_clone)
-    @question = Factory.create(:question, :name => 'which do you like better?', :site => @aoi_clone, :creator => @aoi_clone.default_visitor)
-    @lc = Factory.create(:choice, :question => @question, :creator => @johndoe, :data => 'hello gorgeous')
-    @rc = Factory.create(:choice, :question => @question, :creator => @johndoe, :data => 'goodbye gorgeous')
-    @prompt = Factory.create(:prompt, :question => @question, :tracking => 'sample', :left_choice => @lc, :right_choice => @rc)
-    @valid_attributes = {
-     :left_choice => @lc,
-     :right_choice => @rc,
-     :question => @question
-      
-    }
-  end
-
-  it "should create a new instance given valid attributes" do
-
-  end
 end
@@ -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!
@@ -5,14 +5,9 @@ describe User do
   before(:each) do
     @aoi_clone = Factory.create(:user)
-    @johndoe = Factory.create(:visitor, :identifier => 'johndoe', :site => @aoi_clone)
-    @question = Factory.create(:question, :name => 'which do you like better?', :site => @aoi_clone, :creator => @aoi_clone.default_visitor)
-    @lc = Factory.create(:choice, :question => @question, :creator => @johndoe, :data => 'hello gorgeous')
-    @rc = Factory.create(:choice, :question => @question, :creator => @johndoe, :data => 'goodbye gorgeous')
-    @prompt = Factory.create(:prompt, :question => @question, :tracking => 'sample', :left_choice => @lc, :right_choice => @rc)
+    @question = Factory.create(:aoi_question)
+    @prompt = @question.prompts.first
-    @visitor = @aoi_clone.visitors.find_or_create_by_identifier("test_visitor_identifier")
-    @appearance = @aoi_clone.record_appearance(@visitor, @prompt)
   end
@@ -28,10 +23,12 @@ describe User do
     c = @aoi_clone.create_choice("foobarbaz", q, {:data => 'foobarbaz'})
     q.should_not be_nil
     q.choices.should_not be_empty
-    q.choices.size.should eql 3
+    q.choices.size.should eql 1
   end
   it "should be able to record a visitor's vote" do
+    @visitor = @aoi_clone.visitors.find_or_create_by_identifier("test_visitor_identifier")
+    @appearance = @aoi_clone.record_appearance(@visitor, @prompt)
     v = @aoi_clone.record_vote("johnnydoe", @appearance.lookup, @prompt, 0, 304)
     prompt_votes = @prompt.votes(true)
     prompt_votes.should_not be_empty
@@ -47,6 +44,8 @@ describe User do
   end
   it "should be able to record a visitor's skip" do
+    @visitor = @aoi_clone.visitors.find_or_create_by_identifier("test_visitor_identifier")
+    @appearance = @aoi_clone.record_appearance(@visitor, @prompt)
     s = @aoi_clone.record_skip("johnnydoe", @appearance.lookup, @prompt, 340)
   end
@@ -9,12 +9,13 @@ describe Visitor do
   it {should have_many :clicks}
   before(:each) do
-    @aoi_clone = Factory.create(:user)
-    @johndoe = Factory.create(:visitor, :identifier => 'johndoe', :site => @aoi_clone)
-    @question = Factory.create(:question, :name => 'which do you like better?', :site => @aoi_clone, :creator => @aoi_clone.default_visitor)
-    @lc = Factory.create(:choice, :question => @question, :creator => @johndoe, :data => 'hello gorgeous')
-    @rc = Factory.create(:choice, :question => @question, :creator => @johndoe, :data => 'goodbye gorgeous')
-    @prompt = Factory.create(:prompt, :question => @question, :tracking => 'sample', :left_choice => @lc, :right_choice => @rc)
+    @question = Factory.create(:aoi_question)
+    @aoi_clone = @question.site
+    @johndoe = @question.creator
+
+    @prompt = @question.prompts.first
+    @lc = @prompt.left_choice
+    @rc = @prompt.right_choice
     @visitor = @aoi_clone.visitors.find_or_create_by_identifier("test_visitor_identifier")
     @appearance = @aoi_clone.record_appearance(@visitor, @prompt)
@@ -23,16 +24,15 @@ describe Visitor do
       :identifier => "value for identifier",
       :tracking => "value for tracking"
     }
-    @v = Visitor.create!(@valid_attributes)
-
   end
   it "should create a new instance given valid attributes" do
+    @visitor = Visitor.create!(@valid_attributes)
   end
   it "should be able to determine ownership of a question" do
-    @v.owns?(Question.new).should be_false
+    @visitor.owns?(Question.new).should be_false
     ownedquestion = Factory.create(:question, :site => @aoi_clone, :creator=> @johndoe)
     @johndoe.owns?(ownedquestion).should be_true
@@ -41,20 +41,20 @@ describe Visitor do
   it "should be able to vote for a prompt" do
     #@prompt = @question.prompts.first
     @prompt.should_not be_nil
-    v = @v.vote_for! @appearance.lookup, @prompt, 0, 340
+    v = @visitor.vote_for! @appearance.lookup, @prompt, 0, 340
   end
   it "should be able to skip a prompt" do
     #@prompt = @question.prompts.first
     @prompt.should_not be_nil
-    v = @v.skip! @appearance.lookup, @prompt, 304
+    v = @visitor.skip! @appearance.lookup, @prompt, 304
   end
   it "should accurately update score counts after vote" do
     prev_winner_score = @lc.score
     prev_loser_score = @rc.score
-    vote = @v.vote_for! @appearance.lookup, @prompt, 0, 340
+    vote = @visitor.vote_for! @appearance.lookup, @prompt, 0, 340
     @lc.reload
     @rc.reload
@@ -69,7 +69,7 @@ describe Visitor do
     prev_loser_losses = @rc.losses
     prev_loser_wins = @rc.wins
-    vote = @v.vote_for! @appearance.lookup, @prompt, 0, 340
+    vote = @visitor.vote_for! @appearance.lookup, @prompt, 0, 340
     @lc.reload
     @rc.reload
	@@ -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\|
	@@ -5,22 +5,4 @@ describe Prompt do		@@ -5,22 +5,4 @@ describe Prompt do
5	it {should belong_to :left_choice}	5	it {should belong_to :left_choice}
6	it {should belong_to :right_choice}	6	it {should belong_to :right_choice}
7		7
8	- before(:each) do
9	- @aoi_clone = Factory.create(:user, :email => "pius@alum.mit.edu", :password => "password", :password_confirmation => "password", :id => 8)
10	- @johndoe = Factory.create(:visitor, :identifier => 'johndoe', :site => @aoi_clone)
11	- @question = Factory.create(:question, :name => 'which do you like better?', :site => @aoi_clone, :creator => @aoi_clone.default_visitor)
12	- @lc = Factory.create(:choice, :question => @question, :creator => @johndoe, :data => 'hello gorgeous')
13	- @rc = Factory.create(:choice, :question => @question, :creator => @johndoe, :data => 'goodbye gorgeous')
14	- @prompt = Factory.create(:prompt, :question => @question, :tracking => 'sample', :left_choice => @lc, :right_choice => @rc)
15	- @valid_attributes = {
16	- :left_choice => @lc,
17	- :right_choice => @rc,
18	- :question => @question
19	-
20	- }
21	- end
22	-
23	- it "should create a new instance given valid attributes" do
24	-
25	- end
26	end	8	end