surveyor 0.7.1 → 0.8.0

data/spec/controllers/surveyor_controller_spec.rb

@@ -2,17 +2,18 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe SurveyorController do
   
-  # map.available_surveys 'surveys',                                        :conditions => {:method => :get}, :action => "new"      # GET survey list
-  # map.take_survey       'surveys/:survey_code',                           :conditions => {:method => :post}, :action => "create"  # Only POST of survey to create
-  # map.view_my_survey    'surveys/:survey_code/:response_set_code',        :conditions => {:method => :get}, :action => "show"     # GET viewable/printable? survey
-  # map.edit_my_survey    'surveys/:survey_code/:response_set_code/take',   :conditions => {:method => :get}, :action => "edit"     # GET editable survey 
-  # map.update_my_survey  'surveys/:survey_code/:response_set_code',        :conditions => {:method => :put}, :action => "update"   # PUT edited survey 
-  # map.finish_my_survey  'surveys/:survey_code/:response_set_code/finish', :conditions => {:method => :put}, :action => "finish"   # PUT to close out the response_set
+  # map.with_options :controller => 'surveyor' do |s|
+  #   s.available_surveys "#{root}",                                       :conditions => {:method => :get}, :action => "new"      # GET survey list
+  #   s.take_survey       "#{root}:survey_code",                           :conditions => {:method => :post}, :action => "create"  # Only POST of survey to create
+  #   s.view_my_survey    "#{root}:survey_code/:response_set_code",        :conditions => {:method => :get}, :action => "show"     # GET viewable/printable? survey
+  #   s.edit_my_survey    "#{root}:survey_code/:response_set_code/take",   :conditions => {:method => :get}, :action => "edit"     # GET editable survey 
+  #   s.update_my_survey  "#{root}:survey_code/:response_set_code",        :conditions => {:method => :put}, :action => "update"   # PUT edited survey 
+  # end   
   
-  describe "handling GET /surveys (available_surveys)" do
+  describe "available surveys: GET /surveys" do
 
     before(:each) do
-      @survey = mock_model(Survey)
+      @survey = Factory(:survey)
       Survey.stub!(:find).and_return([@survey])
     end
   
@@ -20,123 +21,67 @@ describe SurveyorController do
       get :new
     end
   
-    it "should be successful" do
-      do_get
-      response.should be_success
-    end
-
     it "should render index template" do
       do_get
+      response.should be_success
       response.should render_template('new')
     end
-  
     it "should find all surveys" do
       Survey.should_receive(:find).with(:all).and_return([@survey])
       do_get
     end
-  
     it "should assign the found surveys for the view" do
       do_get
       assigns[:surveys].should == [@survey]
     end
   end
 
-  describe "handling GET /surveys.xml (available_surveys)" do
-    before(:each) do
-      @surveys = mock("Array of Surveys", :to_xml => "XML")
-      Survey.stub!(:find).and_return(@surveys)
-    end
-  
-    def do_get
-      @request.env["HTTP_ACCEPT"] = "application/xml"
-      get :new
-    end
-  
-    it "should be successful" do
-      do_get
-      response.should be_success
-    end
-
-    it "should find all surveys" do
-      Survey.should_receive(:find).with(:all).and_return(@surveys)
-      do_get
-    end
-  
-    it "should render the found surveys as xml" do
-      @surveys.should_receive(:to_xml).and_return("XML")
-      do_get
-      response.body.should == "XML"
-    end
-  end
-
-  describe "handling POST /surveys/XYZ (take_survey)" do
+  describe "take survey: POST /surveys/XYZ" do
 
     before(:each) do
-      @survey = mock_model(Survey, :access_code => "XYZ")
-      @response_set = mock_model(ResponseSet, :access_code => "PDQ")
-      ResponseSet.stub!(:new).and_return(@response_set)
+      @survey = Factory(:survey, :title => "XYZ", :access_code => "XYZ")
+      @response_set = Factory(:response_set, :access_code => "PDQ")
+      ResponseSet.stub!(:create).and_return(@response_set)
       Survey.stub!(:find_by_access_code).and_return(@survey)
     end
     
-    describe "with successful save" do
-  
+    describe "with success" do
       def do_post
-        @response_set.should_receive(:save!).and_return(true)
         post :create, :survey_code => "XYZ"
       end
-      
       it "should look for the survey" do
         Survey.should_receive(:find_by_access_code).with("XYZ").and_return(@survey)
         do_post
       end
       it "should create a new response_set" do
-        ResponseSet.should_receive(:new).and_return(@response_set)
+        ResponseSet.should_receive(:create).and_return(@response_set)
         do_post
       end
-
       it "should redirect to the new response_set" do
         do_post
         response.should redirect_to(edit_my_survey_url(:survey_code => "XYZ", :response_set_code  => "PDQ"))
       end
-      
     end
     
-    describe "with failed save" do
-
-      def do_post
-        @response_set.should_receive(:save!).and_return(false)
+    describe "with failures" do
+      it "should re-redirect to 'new' if ResponseSet failed create" do
+        ResponseSet.should_receive(:create).and_return(false)
         post :create, :survey_code => "XYZ"
-      end
-  
-      it "should re-redirect to 'new'" do
-        do_post
         response.should redirect_to(available_surveys_url)
       end
-      
-    end
-    
-    describe "with survey not found" do
-
-      def do_post
+      it "should re-redirect to 'new' if Survey failed find" do
         Survey.should_receive(:find_by_access_code).and_return(nil)
         post :create, :survey_code => "XYZ"
-      end
-  
-      it "should re-redirect to 'new'" do
-        do_post
         response.should redirect_to(available_surveys_url)
       end
-      
     end
   end
 
-  describe "handling GET /surveys/XYZ/PDQ (view_my_survey)" do
+  describe "view my survey: GET /surveys/XYZ/PDQ" do
 
     before(:each) do
-      @survey = mock_model(Survey, :access_code => "XYZ", :sections => [mock_model(SurveySection)])  
-      @response_set = mock_model(ResponseSet, :access_code => "PDQ")
-      ResponseSet.stub!(:find_by_access_code).with("PDQ").and_return(@response_set)
-      @response_set.stub!(:survey).and_return(@survey)
+      @survey = Factory(:survey, :title => "XYZ", :access_code => "XYZ", :sections => [Factory(:survey_section)])  
+      @response_set = Factory(:response_set, :access_code => "PDQ", :survey => @survey)
     end
   
     def do_get
@@ -147,28 +92,26 @@ describe SurveyorController do
       do_get
       response.should be_success
     end
-  
     it "should render show template" do
       do_get
       response.should render_template('show')
     end
-  
     it "should find the response_set requested" do
+      pending
       ResponseSet.should_receive(:find_by_access_code).with("PDQ").and_return(@response_set)
       do_get
     end
-  
     it "should assign the found response_set and survey for the view" do
+      pending
       do_get
       assigns[:response_set].should equal(@response_set)
       assigns[:survey].should equal(@survey)
     end
-    
     it "should redirect if :response_code not found" do
+      pending
       get :show, :survey_code => "XYZ", :response_set_code => "DIFFERENT"
       response.should redirect_to(available_surveys_url)      
     end
-    
     # I'm not sure this is enterly neccessary since we look up the survey from the response_code in the url -BC
     it "should redirect if :survey_code in url doesn't match response_set.survey.access_code" do
       pending
@@ -177,27 +120,22 @@ describe SurveyorController do
     end
   end
 
-  describe "handling GET /surveys/XYZ/PDQ/take (edit_my_survey)" do
+  describe "edit my survey: GET /surveys/XYZ/PDQ/take" do
 
     before(:each) do
-      @survey = mock_model(Survey, :access_code => "XYZ")
-      @survey_section = mock_model(SurveySection)
-      @survey.stub!(:sections).and_return([@survey_section])
-      @response_set = mock_model(ResponseSet, :access_code => "PDQ")
-      ResponseSet.stub!(:find_by_access_code).with("PDQ").and_return(@response_set)     
-      @response_set.stub!(:survey).and_return(@survey)
+      @survey = Factory(:survey, :title => "XYZ", :access_code => "XYZ")
+      @section = Factory(:survey_section, :survey => @survey)      
+      @response_set = Factory(:response_set, :access_code => "PDQ", :survey => @survey)
     end
 
     it "should be successful, render edit with the requested survey" do
-      ResponseSet.should_receive(:find_by_access_code).with("PDQ").and_return(@response_set)
-        
+      ResponseSet.should_receive(:find_by_access_code).and_return(@response_set)
       get :edit, :survey_code => "XYZ", :response_set_code => "PDQ"
       response.should be_success
       response.should render_template('edit')
-      assigns[:response_set].should equal(@response_set)
-      assigns[:survey].should equal(@survey)
+      assigns[:response_set].should == @response_set
+      assigns[:survey].should == @survey
     end
-    
     it "should redirect if :response_code not found" do
       get :edit, :survey_code => "XYZ", :response_set_code => "DIFFERENT"
       response.should redirect_to(available_surveys_url)      
@@ -205,124 +143,51 @@ describe SurveyorController do
 
   end
 
-  describe "handling PUT /surveys/XYZ/PDQ (update_my_survey)" do
+  describe "update my survey: PUT /surveys/XYZ/PDQ" do
 
     before(:each) do
-      @survey = mock_model(Survey, :access_code => "XYZ", :sections => [mock_model(SurveySection)])
-      @response_set = mock_model(ResponseSet, :access_code => "PDQ")
-      ResponseSet.stub!(:find_by_access_code).with("PDQ").and_return(@response_set)
-      @response_set.stub!(:survey).and_return(@survey)
-      @response_set.stub!(:add_responses).and_return(true)
+      @survey = Factory(:survey, :title => "XYZ", :access_code => "XYZ")
+      @section = Factory(:survey_section, :survey => @survey)      
+      @response_set = Factory(:response_set, :access_code => "PDQ", :survey => @survey)
+      # @response_set.stub!(:update_attributes).and_return(true)
+      # @response_set.stub!(:complete!).and_return(Time.now)
+      # @response_set.stub!(:save).and_return(true)
     end
     
-    describe "with no response_set in update" do
-
-      it "should find the response set requested" do
-        ResponseSet.should_receive(:find_by_access_code).with("PDQ").and_return(@response_set)
-        put :update, :survey_code => "XYZ", :response_set_code => "PDQ"
-        
-      end
-    
+    def do_put
+      put :update, :survey_code => "XYZ", :response_set_code => "PDQ"
+    end
+    def do_put_with_finish
+      responses = {
+         "6"=>{"question_id"=>"6", "20"=>{"string_value"=>"saf"}}, #string
+         "7"=>{"question_id"=>"7", "21"=>{"text_value"=>""}}, #text
+         "1"=>{"question_id"=>"1", "answer_id"=>"1", "4"=>{"string_value"=>""}}, #radio+txt
+         "2"=>{"answer_id"=>"6"}, #radio
+         "3"=>{"answer_id"=>"10"}, #radio
+         "4"=>{"question_id"=>"4", "answer_id"=>"15"}, #check
+         "5"=>{"question_id"=>"5", "16"=>{"selected"=>"1"}, "19"=>{"string_value"=>""}} #check+txt
+      }
+      put :update, :survey_code => "XYZ", :response_set_code => "PDQ", :finish => "finish", :responses => responses
     end
     
-    describe "with a new response set" do
-      
-      it "should accept properly formatted params and save the data" do
-        response_set_params = {"survey_code"=>"XYZ", "response_set"=>{"new_response_attributes"=>{"1"=>[{"answer_id"=>"2"}]}}}
-        
-        
-      end
-      
-      # describe "issue with posting data to an existing survey and the data not saving properly" do
-      #    @survey = mock_model(Survey, :access_code => "XYZ")
-      #    @response_set = mock_model(ResponseSet, :access_code => "PDQ")
-      #    ResponseSet.stub!(:find_by_access_code).with("PDQ").and_return(@response_set)
-      #    @response_set.stub!(:survey).and_return(@survey)
-      #    @response_set.stub!(:complete!).and_return(Time.now)
-      #    
-      #    
-      #  end
-
-      # first post {"survey_code"=>"test_survey", "commit"=>"Next Section (Utensiles and you!) >>", "response_set"=>{"new_response_attributes"=>{"1"=>[{"answer_id"=>"2"}, {"answer_id"=>"0", "string_value"=>""}], "2"=>[{"answer_id"=>"6"}], "3"=>[{"answer_id"=>"10"}], "4"=>[{"answer_id"=>"14"}], "5"=>[{"answer_id"=>"0"}, {"answer_id"=>"0"}]}, "existing_response_attributes"=>{"6"=>{"1"=>{"answer_id"=>"20", "string_value"=>"B"}}, "7"=>{"2"=>{"text_value"=>"foo", "answer_id"=>"21"}}, "5"=>{"7"=>{"answer_id"=>"17"}, "16"=>{"answer_id"=>"19", "string_value"=>"blah"}}}}, "authenticity_token"=>"d9ba68fe20a46703f3737b5cb0b7e17b7390de32", "_method"=>"put", "action"=>"update", "controller"=>"app", "response_set_code"=>"9VEsec1dK6", "section"=>"2"}
-      # second post {"survey_code"=>"test_survey", "commit"=>"Next Section (Utensiles and you!) >>", "response_set"=>{"new_response_attributes"=>{"1"=>[{"answer_id"=>"2"}, {"answer_id"=>"0", "string_value"=>""}], "2"=>[{"answer_id"=>"6"}], "3"=>[{"answer_id"=>"10"}], "4"=>[{"answer_id"=>"14"}], "5"=>[{"answer_id"=>"0"}, {"answer_id"=>"0"}]}, "existing_response_attributes"=>{"6"=>{"1"=>{"answer_id"=>"20", "string_value"=>"B"}}, "7"=>{"2"=>{"text_value"=>"boooo", "answer_id"=>"21"}}, "5"=>{"7"=>{"answer_id"=>"17"}, "16"=>{"answer_id"=>"19", "string_value"=>"blahblahstink"}}}}, "authenticity_token"=>"d9ba68fe20a46703f3737b5cb0b7e17b7390de32", "_method"=>"put", "action"=>"update", "controller"=>"app", "response_set_code"=>"9VEsec1dK6", "section"=>"2"}
-
-      
+    it "should find the response set requested" do
+      ResponseSet.should_receive(:find_by_access_code).and_return(@response_set)
+      do_put
     end
-    
-    
-    describe "with failed update" do
-
-      it "should re-render 'edit'" do
-        put :update, :survey_code => "XYZ", :response_set_code => "PDQ"
-        response.should be_success
-        response.should render_template('edit')
-        flash[:notice].should == "Unable to update survey"
-      end
-
+    it "should redirect to 'edit' without params" do
+      do_put
+      response.should redirect_to(:action => :edit)
+      flash[:notice].should == "Unable to update survey"
     end
-  end
-
-  describe "handling PUT /surveys/XYZ/PDQ/finish (finish_my_survey)" do
-
-    before(:each) do
-      @survey = mock_model(Survey, :access_code => "XYZ", :sections => [mock_model(SurveySection)])
-      @response_set = mock_model(ResponseSet, :access_code => "PDQ")
-      ResponseSet.stub!(:find_by_access_code).with("PDQ").and_return(@response_set)
-      @response_set.stub!(:survey).and_return(@survey)
-      @response_set.stub!(:complete!).and_return(Time.now)
+    it "should complete the found response set on finish" do      
+      do_put_with_finish
+      flash[:notice].should == "Completed survey"
     end
-    
-    describe "with successful update" do
-
-      def do_put
-        put :finish, :survey_code => "XYZ", :response_set_code => "PDQ"
-      end
-
-      it "should find the response_set requested" do
-        ResponseSet.should_receive(:find_by_access_code).with("PDQ").and_return(@response_set)
-        do_put
-      end
-
-      it "should update the found response set" do
-        @response_set.should_receive(:complete!).and_return(Time.now)
-        do_put
-      end
-
-      it "should assign the found response set and survey for the view" do
-        do_put
-        assigns(:response_set).should equal(@response_set)
-        assigns(:survey).should equal(@response_set.survey)
-      end
-
-      it "should render the 'edit' template" do
-        do_put
-        response.should render_template('edit')
-        flash[:notice].should == "Completed survey"
-      end
-      
-      it "should redirect to available surveys if :response_code not found" do
-        put :update, :survey_code => "XYZ", :response_set_code => "DIFFERENT"
-        response.should redirect_to(available_surveys_url)
-        flash[:notice].should == "Unable to find your responses to the survey"
-      end
-
+    it "should redirect to available surveys if :response_code not found" do
+      put :update, :survey_code => "XYZ", :response_set_code => "DIFFERENT"
+      response.should redirect_to(available_surveys_url)
+      flash[:notice].should == "Unable to find your responses to the survey"
     end
-    
-    describe "with failed update" do
-
-      def do_put
-        put :finish, :survey_code => "XYZ", :response_set_code => "PDQ"
-      end
 
-      it "should re-render 'edit'" do
-        @response_set.should_receive(:complete!).and_return(false)
-        do_put
-        response.should render_template('edit')
-        flash[:notice].should == "Unable to complete survey"
-      end
-
-    end
   end
-  
-
 end

data/spec/factories.rb

@@ -22,19 +22,33 @@ end
 
 Factory.sequence(:question_display_order){|n| n }
 
-Factory.define :question do |s|
-  s.association             :survey_section  # s.survey_section_id       {}
-  s.text		                {"What is your favorite color?"}
-  s.short_text		          {"favorite_color"}
-  s.help_text	        	    {"just write it in the box"}
-  s.pick	            	    {:none}
-  s.display_type	    	    {} # nil is default
-  s.display_order	    	    {Factory.next :question_display_order}
-  s.question_group_id		    {}
-  s.is_mandatory	    	    {false}
-  s.reference_identifier		{|me| "q_#{me.object_id}"}
-  s.data_export_identifier	{}
-  s.display_width       		{}
+Factory.define :question do |q|
+  q.association             :survey_section  # s.survey_section_id       {}
+  q.question_group_id		    {}
+  q.text		                {"What is your favorite color?"}
+  q.short_text		          {"favorite_color"}
+  q.help_text	        	    {"just write it in the box"}
+  q.pick	            	    {:none}
+  q.reference_identifier    {|me| "q_#{me.object_id}"}
+  q.data_export_identifier  {}
+  q.common_namespace        {}
+  q.common_identifier       {}
+  q.display_order	    	    {Factory.next :question_display_order}
+  q.display_type	    	    {} # nil is default
+  q.is_mandatory	    	    {false}
+  q.display_width       		{}
+end
+
+Factory.define :question_group do |g|
+  g.text                    {"Describe your family"}
+  g.help_text               {}
+  g.reference_identifier    {|me| "g_#{me.object_id}"}
+  g.data_export_identifier  {}
+  g.common_namespace        {}
+  g.common_identifier       {}
+  g.display_type            {}
+  g.custom_class            {}
+  g.custom_renderer         {}
 end
 
 Factory.sequence(:answer_display_order){|n| n }
@@ -46,26 +60,23 @@ Factory.define :answer do |a|
   a.help_text	              	{"Clear is the absense of color"}
   a.weight		                {}
   a.response_class        		{"String"}
-  a.display_order	        	  {}
-  a.is_exclusive	        	  {}
-  a.hide_label    		        {}
   a.reference_identifier		  {}
   a.data_export_identifier		{}
-  a.common_data_identitier		{}
-  a.max_value	              	{}
-  a.min_value	              	{}
-  a.length		                {}
-  a.decimal_precision     		{}
-  a.allow_negative	          {}
-  a.allow_blank		            {}
-  a.unit		                  {}
+  a.common_namespace          {}
+  a.common_identifier     		{}
+  a.display_order	        	  {Factory.next :answer_display_order}
+  a.is_exclusive	        	  {}
+  a.hide_label    		        {}
   a.display_length		        {}
+  a.custom_class              {}
+  a.custom_renderer           {}
 end
 
 Factory.define :dependency do |d|
   # the dependent question
   d.association       :question # d.question_id       {}
-  d.rule              {"1"}
+  d.question_group_id {}
+  d.rule              {"A and B"}
 end
 
 Factory.define :dependency_condition do |d|
@@ -105,3 +116,25 @@ Factory.define :response do |r|
   r.response_other		{}
   r.response_group		{}
 end
+
+Factory.define :validation do |v|
+  v.association       :answer # v.answer_id         {}
+  v.rule              {"A"}
+  v.message           {}
+end
+
+Factory.define :validation_condition do |v|
+  v.association       :validation # v.validation_id     {}
+  v.rule_key          {"A"}
+  v.question_id       {}
+  v.operator          {"=="}
+  v.answer_id         {}
+  v.datetime_value    {}
+  v.integer_value     {}
+  v.float_value       {}
+  v.unit              {}
+  v.text_value        {}
+  v.string_value      {}
+  v.response_other    {}
+  v.regexp            {}
+end

data/spec/models/answer_spec.rb

@@ -9,7 +9,7 @@ describe Answer, "when creating a new answer" do
     @answer.should be_valid
   end
 
-  it "should be invalid without a unique reference identifier (within the scope of its parent)" do
+  it "should be invalid without a question_id" do
     @answer.question_id = nil
     @answer.should_not be_valid
   end