Fixed tests. Survey cannot be created with null name. Needed attribut…

…e accessor for name.
CamfedCode · Nov 22, 2013 · ecd0bac · ecd0bac
1 parent b21bfae
commit ecd0bac
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/app/models/epi_surveyor/survey.rb b/app/models/epi_surveyor/survey.rb
@@ -11,7 +11,7 @@ class Survey < ActiveRecord::Base
     has_many :object_mappings, :dependent => :destroy
     has_many :import_histories, :dependent => :destroy
 
-    attr_accessible :id, :notification_email, :mapping_status
+    attr_accessible :id, :notification_email, :mapping_status, :name
     attr_accessor :responses
 
     scope :ordered, order('name ASC')

diff --git a/spec/controllers/surveys_controller_spec.rb b/spec/controllers/surveys_controller_spec.rb
@@ -78,7 +78,7 @@
 
   describe "PUT 'update'" do
     it "should update a survey" do
-      survey = EpiSurveyor::Survey.new
+      survey = EpiSurveyor::Survey.new(:name=>"Test Survey")
       EpiSurveyor::Survey.should_receive(:find).with(1).and_return(survey)
       put 'update', :id => 1, :epi_surveyor_survey => {:notification_email => 'hello@example.com'}
       assigns[:survey].notification_email.should == 'hello@example.com'      
@@ -128,7 +128,7 @@
 
   describe 'update_mapping_status' do
     it 'should update mapping_status' do
-      survey = EpiSurveyor::Survey.create(:id => 1)
+      survey = EpiSurveyor::Survey.create(:name => 'Test Survey', :id => 1)
       post 'update_mapping_status', :id => 1, :mapping_status => 'Mapped'
       survey.reload
       survey.mapping_status.should == 'Mapped'

diff --git a/spec/models/epi_surveyor/survey_spec.rb b/spec/models/epi_surveyor/survey_spec.rb
@@ -348,7 +348,7 @@ def create_mock_twilio_message
 
   describe "update_mapping_status" do
     it "should update mapping status as Unmapped if all questions are unmapped" do
-      survey = EpiSurveyor::Survey.create
+      survey = EpiSurveyor::Survey.create(:name=>"testSurvey")
       questions = [EpiSurveyor::Question.new, EpiSurveyor::Question.new]
       survey.should_receive(:questions).and_return(questions)
       survey.should_receive(:unmapped_questions).and_return(questions)
@@ -359,7 +359,7 @@ def create_mock_twilio_message
     end
 
     it "should update mapping status as Unmapped if some questions are mapped" do
-      survey = EpiSurveyor::Survey.create
+      survey = EpiSurveyor::Survey.create(:name=>'testSurvey')
       question1 = EpiSurveyor::Question.new
       question2 = EpiSurveyor::Question.new
       survey.should_receive(:questions).and_return([question1, question2])
@@ -371,7 +371,7 @@ def create_mock_twilio_message
     end
 
     it "should update not update mapping status if mapping_status is Mapped" do
-      survey = EpiSurveyor::Survey.create(:mapping_status => EpiSurveyor::Survey::MAPPING_STATUS::MAPPED)
+      survey = EpiSurveyor::Survey.create(:mapping_status => EpiSurveyor::Survey::MAPPING_STATUS::MAPPED, :name=>'testSurvey')
 
       survey.update_mapping_status
       survey.reload
@@ -381,8 +381,8 @@ def create_mock_twilio_message
 
   describe "having_mapping_status" do
     before :each do
-      @survey1 = EpiSurveyor::Survey.create(:mapping_status => EpiSurveyor::Survey::MAPPING_STATUS::MAPPED)
-      @survey2 = EpiSurveyor::Survey.create(:mapping_status => EpiSurveyor::Survey::MAPPING_STATUS::UNMAPPED)
+      @survey1 = EpiSurveyor::Survey.create(:mapping_status => EpiSurveyor::Survey::MAPPING_STATUS::MAPPED, :name=>'testSurvey1')
+      @survey2 = EpiSurveyor::Survey.create(:mapping_status => EpiSurveyor::Survey::MAPPING_STATUS::UNMAPPED, :name=>'testSurvey2')
     end
 
     it "should return all records if having_mapping_status is scoped but no mapping_status is requested" do
@@ -402,8 +402,8 @@ def create_mock_twilio_message
 
   describe "modified_between" do
     before :each do
-      @survey1 = EpiSurveyor::Survey.create
-      @survey2 = EpiSurveyor::Survey.create
+      @survey1 = EpiSurveyor::Survey.create(:name=>'testSurvey1')
+      @survey2 = EpiSurveyor::Survey.create(:name=>'testSurvey2')
       @survey1.update_attribute(:mapping_last_modified_at, Time.now - 2.days)
       @survey2.update_attribute(:mapping_last_modified_at, Time.now - 1.days)
     end
@@ -432,8 +432,8 @@ def create_mock_twilio_message
 
   describe "starting_with" do
     before :each do
-      @survey1 = EpiSurveyor::Survey.create
-      @survey2 = EpiSurveyor::Survey.create
+      @survey1 = EpiSurveyor::Survey.create(:name=>'testSurvey1')
+      @survey2 = EpiSurveyor::Survey.create(:name=>'testSurvey2')
       @survey1.update_attribute(:name, 'Abc')
       @survey2.update_attribute(:name, 'Def')
     end