oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes to Survey tests and merged code from 7.10

Browse source
This commit is contained in:
Colin Kuskie 2012-01-17 19:10:16 -08:00
parent 1ab73e2f73
commit a6e1adf183
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
docs/migration.txt
View file

@ -422,3 +422,8 @@ getEditForm now returns a WebGUI::FormBuilder object
Show Performance Indicators Show Performance Indicators
========================== ==========================
This setting is removed, as the Plack debug console shows this for us. This setting is removed, as the Plack debug console shows this for us.
WebGUI::Asset::Wobject::Survey
==========================
The surveyJSON method conflicted with the new Moose accessor. In WebGUI 8,
the old surveyJSON is called getSurveyJSON.

4
lib/WebGUI/Asset/Wobject/Survey.pm
View file

@ -2439,8 +2439,8 @@ Extend the base method to include custom question types added to this Survey.
sub exportAssetData { sub exportAssetData {
my $self = shift; my $self = shift;
my $asset_data = $self->SUPER::exportAssetData(); my $asset_data = $self->SUPER::exportAssetData();
my $questions = $self->surveyJSON->questions(); my $questions = $self->getSurveyJSON->questions();
my $multiple_choice = $self->surveyJSON->multipleChoiceTypes(); my $multiple_choice = $self->getSurveyJSON->multipleChoiceTypes();
my %question_types = (); my %question_types = ();
my $get_question = $self->session->db->prepare('select answers from Survey_questionTypes where questionType=?'); my $get_question = $self->session->db->prepare('select answers from Survey_questionTypes where questionType=?');
foreach my $question (@{ $questions }) { foreach my $question (@{ $questions }) {

4
t/Asset/Wobject/Survey/package.t
View file

@ -27,7 +27,7 @@ my $import_node = WebGUI::Asset->getImportNode($session);
my $survey = $import_node->addChild( { className => 'WebGUI::Asset::Wobject::Survey', } ); my $survey = $import_node->addChild( { className => 'WebGUI::Asset::Wobject::Survey', } );
WebGUI::Test->addToCleanup($survey); WebGUI::Test->addToCleanup($survey);
my $sJSON = $survey->surveyJSON; my $sJSON = $survey->getSurveyJSON;
# Load bare-bones survey, containing a single section (S0) # Load bare-bones survey, containing a single section (S0)
$sJSON->update([0], { variable => 'S0' }); $sJSON->update([0], { variable => 'S0' });
@ -57,7 +57,7 @@ $asset_data->{question_types}->{fingers} = clone $asset_data->{question_types}->
$survey->importAssetCollateralData($asset_data); $survey->importAssetCollateralData($asset_data);
$survey = $survey->cloneFromDb; $survey = $survey->cloneFromDb;
my $multipleChoiceTypes = $survey->surveyJSON->multipleChoiceTypes; my $multipleChoiceTypes = $survey->getSurveyJSON->multipleChoiceTypes;
ok exists $multipleChoiceTypes->{fingers}, 'fingers type imported as package collateral data'; ok exists $multipleChoiceTypes->{fingers}, 'fingers type imported as package collateral data';
ok exists $multipleChoiceTypes->{toes}, 'still have toes, too'; ok exists $multipleChoiceTypes->{toes}, 'still have toes, too';