moodle2cc 0.2.4 → 0.2.5

data/spec/moodle2cc/moodle2/parsers/course_parser_spec.rb

@@ -12,6 +12,7 @@ module Moodle2CC::Moodle2::Parsers
       expect(course.startdate).to eq(Time.parse('Sat, 15 Feb 2014 00:00:00 GMT'))
       expect(course.summary).to eq('<p>This is my course summary</p>')
       expect(course.course_id).to eq('2')
+      expect(course.show_grades).to eq true
     end
 
   end

data/spec/moodle2cc/moodle2/parsers/feedback_parser_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Moodle2CC::Moodle2::Parsers::FeedbackParser do
+  subject { Moodle2CC::Moodle2::Parsers::FeedbackParser.new(fixture_path(File.join('moodle2', 'backup'))) }
+
+  it 'should parse a feedback activity' do
+    feedbacks = subject.parse
+    expect(feedbacks.count).to eq 1
+    feedback = feedbacks.first
+
+    expect(feedback.id).to eq '7'
+
+    expect(feedback.module_id).to eq '58588'
+    expect(feedback.name).to eq 'feedback name'
+    expect(feedback.intro).to eq '<p>feedback description</p>'
+    expect(feedback.intro_format).to eq '1'
+    expect(feedback.time_close).to eq '0'
+    expect(feedback.time_open).to eq '0'
+    expect(feedback.time_modified).to eq '1397566320'
+
+    expect(feedback.items.count).to eq 9
+    item = feedback.items.last
+    expect(item.id).to eq '131'
+    expect(item.name).to eq 'short text question'
+    expect(item.label).to eq 'shorttextlabel'
+    expect(item.position).to eq '9'
+    expect(item.type).to eq 'textfield'
+    expect(item.presentation).to eq '30|5'
+  end
+
+end

data/spec/moodle2cc/moodle2/parsers/questionnaire_parser_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Moodle2CC::Moodle2::Parsers::QuestionnaireParser do
+  subject { Moodle2CC::Moodle2::Parsers::QuestionnaireParser.new(fixture_path(File.join('moodle2', 'backup'))) }
+
+  it 'should parse a questionnaire activity' do
+    questionnaires = subject.parse
+    expect(questionnaires.count).to eq 1
+    questionnaire = questionnaires.first
+
+    expect(questionnaire.id).to eq '1'
+
+    expect(questionnaire.module_id).to eq '9'
+    expect(questionnaire.name).to eq 'Questionnaire Name'
+    expect(questionnaire.intro).to eq '<p>Sumary</p>'
+    expect(questionnaire.intro_format).to eq '1'
+    expect(questionnaire.open_date).to eq '0'
+    expect(questionnaire.close_date).to eq '0'
+    expect(questionnaire.time_modified).to eq '1395073600'
+
+    expect(questionnaire.questions.count).to eq 10
+    question = questionnaire.questions.first
+    expect(question.id).to eq '1'
+    expect(question.name).to eq 'Checkboxes Quesiton'
+    expect(question.position).to eq '1'
+    expect(question.type_id).to eq '5'
+
+    expect(question.choices.count).to eq 3
+    expect(question.choices.first).to eq ({:id => '1', :content => 'possible answer 1'})
+  end
+
+end

data/spec/moodle2cc/moodle2converter/assessment_converter_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 describe Moodle2CC::Moodle2Converter::AssessmentConverter do
-  let(:moodle_quiz) {Moodle2CC::Moodle2::Models::Quizzes::Quiz.new}
 
   it 'converts a moodle2 quiz to a canvas assessment' do
+    moodle_quiz = Moodle2CC::Moodle2::Models::Quizzes::Quiz.new
     moodle_quiz.id = 'quiz id'
     moodle_quiz.name = 'Quiz naem'
     moodle_quiz.intro = '<p> stuff </p>'
@@ -19,7 +19,7 @@ describe Moodle2CC::Moodle2Converter::AssessmentConverter do
     moodle_quiz.time_limit = "100"
     moodle_quiz.visible = false
 
-    canvas_assessment = subject.convert(moodle_quiz)
+    canvas_assessment = subject.convert_quiz(moodle_quiz)
 
     expect(canvas_assessment.identifier).to eq 'm2d1dcd9630366a2c923c30734423c3fe8_assessment'
     expect(canvas_assessment.title).to eq moodle_quiz.name
@@ -41,9 +41,164 @@ describe Moodle2CC::Moodle2Converter::AssessmentConverter do
     moodle_quiz.attempts_number = 0 # Infinite attempts
     moodle_quiz.grade_method = 4
 
-    canvas_assessment2 = subject.convert(moodle_quiz)
+    canvas_assessment2 = subject.convert_quiz(moodle_quiz)
     expect(canvas_assessment2.allowed_attempts).to eq -1
     expect(canvas_assessment2.scoring_policy).to eq 'keep_latest'
   end
 
+  it 'converts a moodle2 choice to a canvas assessment' do
+    moodle_choice = Moodle2CC::Moodle2::Models::Choice.new
+    moodle_choice.id = 'choice_id'
+    moodle_choice.name = "i'm an silly choice"
+    moodle_choice.intro = 'which of these arbitrary options do you like best?'
+
+    moodle_choice.visible = false
+    moodle_choice.time_open = Time.parse('Sat, 08 Feb 2014 16:00:00 GMT').to_i.to_s
+    moodle_choice.time_close = Time.parse('Sat, 08 Feb 2014 18:00:00 GMT').to_i.to_s
+    moodle_choice.completion_submit = '1'
+
+    moodle_choice.options = ['Option 1', 'Option 2', 'Option 3']
+
+    canvas_assessment = subject.convert_choice(moodle_choice)
+
+    expect(canvas_assessment.identifier).to eq 'm2428bb064a60ddb92239e9c818fbf33ff_choice_assessment'
+    expect(canvas_assessment.title).to eq moodle_choice.name
+    expect(canvas_assessment.description).to eq ''
+
+    expect(canvas_assessment.unlock_at).to eq Time.parse('Sat, 08 Feb 2014 16:00:00 GMT')
+    expect(canvas_assessment.lock_at).to eq Time.parse('Sat, 08 Feb 2014 18:00:00 GMT')
+    expect(canvas_assessment.allowed_attempts).to eq 1
+    expect(canvas_assessment.scoring_policy).to eq 'keep_latest'
+    expect(canvas_assessment.quiz_type).to eq 'survey'
+    expect(canvas_assessment.workflow_state).to eq Moodle2CC::CanvasCC::Models::WorkflowState::UNPUBLISHED
+
+    expect(canvas_assessment.items.count).to eq 1
+    question = canvas_assessment.items.first
+
+    expect(question.question_type).to eq 'multiple_choice_question'
+    expect(question.material).to eq moodle_choice.intro
+    expect(question.answers.map(&:answer_text)).to eq moodle_choice.options
+  end
+
+  it 'converts a moodle2 questionnaire to a canvas assessment' do
+    moodle_questionnaire = Moodle2CC::Moodle2::Models::Questionnaire.new
+    moodle_questionnaire.id = 'questionnaire_id'
+    moodle_questionnaire.name = "i'm an silly questionnaire"
+    moodle_questionnaire.intro = 'i should be an ungraderded survey'
+
+    moodle_questionnaire.visible = false
+    moodle_questionnaire.open_date = Time.parse('Sat, 08 Feb 2014 16:00:00 GMT').to_i.to_s
+    moodle_questionnaire.close_date = Time.parse('Sat, 08 Feb 2014 18:00:00 GMT').to_i.to_s
+
+    question1 = Moodle2CC::Moodle2::Models::Questionnaire::Question.new
+    question1.id = '2'
+    question1.name = 'q name'
+    question1.content = 'quest 1'
+    question1.type_id = '2'
+
+    question2 = Moodle2CC::Moodle2::Models::Questionnaire::Question.new
+    question2.id = '3'
+    question2.name = 'q name 2'
+    question2.content = 'question2 text'
+    question2.type_id = '8'
+    question2.choices = [{:id => '4', :content => 'choice3'}, {:id => '5', :content => 'choice4'}]
+
+    moodle_questionnaire.questions = [question1, question2]
+
+    canvas_assessment = subject.convert_questionnaire(moodle_questionnaire)
+
+    expect(canvas_assessment.identifier).to eq 'm2a530129147e6ee3df09cab63c6ebcb2e_questionnaire_assessment'
+    expect(canvas_assessment.title).to eq moodle_questionnaire.name
+    expect(canvas_assessment.description).to eq moodle_questionnaire.intro
+
+    expect(canvas_assessment.unlock_at).to eq Time.parse('Sat, 08 Feb 2014 16:00:00 GMT')
+    expect(canvas_assessment.lock_at).to eq Time.parse('Sat, 08 Feb 2014 18:00:00 GMT')
+    expect(canvas_assessment.scoring_policy).to eq 'keep_latest'
+    expect(canvas_assessment.quiz_type).to eq 'survey'
+    expect(canvas_assessment.workflow_state).to eq Moodle2CC::CanvasCC::Models::WorkflowState::UNPUBLISHED
+
+    expect(canvas_assessment.items.count).to eq 2
+
+    canvas_question1 = canvas_assessment.items[0]
+    expect(canvas_question1.question_type).to eq 'essay_question'
+    expect(canvas_question1.material).to eq question1.content
+    expect(canvas_question1.title).to eq question1.name
+    expect(canvas_question1.answers).to eq []
+
+    canvas_question2 = canvas_assessment.items[1]
+    expect(canvas_question2.question_type).to eq 'multiple_choice_question'
+    expect(canvas_question2.material).to eq question2.content
+    expect(canvas_question2.title).to eq question2.name
+    expect(canvas_question2.answers.count).to eq 2
+
+    expect(canvas_question2.answers.map(&:id)).to eq (question2.choices.map{|c| c[:id]})
+    expect(canvas_question2.answers.map(&:answer_text)).to eq (question2.choices.map{|c| c[:content]})
+  end
+
+  it "should convert a moodle2 feedback activity to an ungraded assessment" do
+    moodle_feedback = Moodle2CC::Moodle2::Models::Feedback.new
+    moodle_feedback.id = 'feedback_id'
+    moodle_feedback.name = "i'm an silly feedback"
+    moodle_feedback.intro = 'i should be an ungraderded survey'
+
+    moodle_feedback.visible = false
+    moodle_feedback.time_open = Time.parse('Sat, 08 Feb 2014 16:00:00 GMT').to_i.to_s
+    moodle_feedback.time_close = Time.parse('Sat, 08 Feb 2014 18:00:00 GMT').to_i.to_s
+
+    question1 = Moodle2CC::Moodle2::Models::Feedback::Question.new
+    question1.id = '2'
+    question1.name = 'actualy question'
+    question1.label = 'q name'
+    question1.type = 'multichoice'
+    question1.presentation = 'r>>>>>Option 1\n|Option 2\n|Option 3'
+
+    question2 = Moodle2CC::Moodle2::Models::Feedback::Question.new
+    question2.id = '2'
+    question2.name = 'actualy also question'
+    question2.label = 'q name 2'
+    question2.type = 'multichoicerated'
+    question2.presentation = 'r>>>>>1####Option1\n    |2####Option2\n     |3####Option3'
+
+    question3 = Moodle2CC::Moodle2::Models::Feedback::Question.new
+    question3.id = '2'
+    question3.name = 'label label'
+    question3.label = ''
+    question3.type = 'label'
+    question3.presentation = 'actually the text for the label'
+
+    moodle_feedback.items = [question1, question2, question3]
+
+    canvas_assessment = subject.convert_feedback(moodle_feedback)
+
+    expect(canvas_assessment.identifier).to eq 'm20188a0c97e17ce57511316621805da83_feedback_assessment'
+    expect(canvas_assessment.title).to eq moodle_feedback.name
+    expect(canvas_assessment.description).to eq moodle_feedback.intro
+
+    expect(canvas_assessment.unlock_at).to eq Time.parse('Sat, 08 Feb 2014 16:00:00 GMT')
+    expect(canvas_assessment.lock_at).to eq Time.parse('Sat, 08 Feb 2014 18:00:00 GMT')
+    expect(canvas_assessment.scoring_policy).to eq 'keep_latest'
+    expect(canvas_assessment.quiz_type).to eq 'survey'
+    expect(canvas_assessment.workflow_state).to eq Moodle2CC::CanvasCC::Models::WorkflowState::UNPUBLISHED
+
+    expect(canvas_assessment.items.count).to eq 3
+
+    canvas_question1 = canvas_assessment.items[0]
+    expect(canvas_question1.question_type).to eq 'multiple_choice_question'
+    expect(canvas_question1.material).to eq question1.name
+    expect(canvas_question1.title).to eq question1.label
+    expect(canvas_question1.answers.count).to eq 3
+    expect(canvas_question1.answers.map(&:answer_text)).to eq ['Option 1', 'Option 2', 'Option 3']
+
+    canvas_question2 = canvas_assessment.items[1]
+    expect(canvas_question2.question_type).to eq 'multiple_choice_question'
+    expect(canvas_question2.material).to eq question2.name
+    expect(canvas_question2.title).to eq question2.label
+    expect(canvas_question2.answers.count).to eq 3
+    expect(canvas_question2.answers.map(&:answer_text)).to eq ['[1] Option1', '[2] Option2', '[3] Option3']
+
+    canvas_question3 = canvas_assessment.items[2]
+    expect(canvas_question3.question_type).to eq 'text_only_question'
+    expect(canvas_question3.material).to eq question3.presentation
+    expect(canvas_question3.title).to eq question3.name
+  end
 end

data/spec/moodle2cc/moodle2converter/converter_helper_spec.rb

@@ -70,6 +70,20 @@ module Moodle2CC
         expect(subject).to have_received(:generate_unique_identifier_for).with('id', '_assessment')
       end
 
+      it 'generates a unique identifier for a Choice' do
+        choice = Moodle2CC::Moodle2::Models::Choice.new
+        choice.id = 'id'
+        subject.generate_unique_identifier_for_activity(choice)
+        expect(subject).to have_received(:generate_unique_identifier_for).with('id', '_choice_assessment')
+      end
+
+      it 'generates a unique identifier for a Questionnaire' do
+        questionnaire = Moodle2CC::Moodle2::Models::Questionnaire.new
+        questionnaire.id = 'id'
+        subject.generate_unique_identifier_for_activity(questionnaire)
+        expect(subject).to have_received(:generate_unique_identifier_for).with('id', '_questionnaire_assessment')
+      end
+
       it 'generates a unique identifier for an Assignment' do
         assignment = Moodle2CC::Moodle2::Models::Assignment.new
         assignment.id = 'id'
@@ -107,6 +121,16 @@ module Moodle2CC
         expect(subject.activity_content_type(quiz)).to eq CanvasCC::Models::ModuleItem::CONTENT_TYPE_QUIZ
       end
 
+      it 'looks up the content type for a Choice' do
+        choice = Moodle2CC::Moodle2::Models::Choice.new
+        expect(subject.activity_content_type(choice)).to eq CanvasCC::Models::ModuleItem::CONTENT_TYPE_QUIZ
+      end
+
+      it 'looks up the content type for a Questionnaire' do
+        questionnaire = Moodle2CC::Moodle2::Models::Questionnaire.new
+        expect(subject.activity_content_type(questionnaire)).to eq CanvasCC::Models::ModuleItem::CONTENT_TYPE_QUIZ
+      end
+
       it 'looks up the content type for an Assignment' do
         assignment = Moodle2CC::Moodle2::Models::Assignment.new
         expect(subject.activity_content_type(assignment)).to eq CanvasCC::Models::ModuleItem::CONTENT_TYPE_ASSIGNMENT

data/spec/moodle2cc/moodle2converter/folder_converter_spec.rb

@@ -25,6 +25,7 @@ module Moodle2CC
     it 'converts a moodle folder to a canvas page' do
       moodle2_folder.id = '3'
       moodle2_folder.name = 'Folder Name'
+      moodle2_folder.intro = 'introduction and stuff'
       moodle2_folder.visible = true
       canvas_page = subject.convert(moodle2_folder)
       expect(canvas_page.identifier).to eq 'm2eccbc87e4b5ce2fe28308fd9f2a7baf3_folder'
@@ -32,6 +33,7 @@ module Moodle2CC
       expect(canvas_page.workflow_state).to eq('active')
       expect(canvas_page.editing_roles).to eq('teachers')
       expect(canvas_page.body).to include('ul')
+      expect(canvas_page.body).to include(moodle2_folder.intro)
       expect(canvas_page.body).to include('<li><p><a href="@@PLUGINFILE@@/file1.txt">file1.txt</a></p></li>')
       expect(canvas_page.body).to include('<li><p><a href="@@PLUGINFILE@@/file2.txt">file2.txt</a></p></li>')
       expect(canvas_page.body).to include('<li><p><a href="@@PLUGINFILE@@/subfolder1/file4.txt">subfolder1/file4.txt</a></p></li>')

data/spec/moodle2cc/moodle2converter/glossary_converter_spec.rb

@@ -28,9 +28,8 @@ module Moodle2CC
       expect(canvas_page.editing_roles).to eq('teachers,students')
 
       expect(canvas_page.body).to include('<h2>Glossary Name</h2>')
-      expect(canvas_page.body).to include('<table><tr><th>Concept</th><th>Definition</th></tr>')
-      expect(canvas_page.body).to include("<tr><td style='padding-right:10px'>Concept number 0</td><td>Definition number 0</td></tr>")
-      expect(canvas_page.body).to include("<tr><td style='padding-right:10px'>Concept number 1</td><td>Definition number 1</td></tr>")
+      expect(canvas_page.body).to include("<dt>Concept number 0</dt><dd>Definition number 0</dd>")
+      expect(canvas_page.body).to include("<dt>Concept number 1</dt><dd>Definition number 1</dd>")
     end
   end
 end

data/spec/moodle2cc/moodle2converter/label_converter_spec.rb

@@ -0,0 +1,86 @@
+require 'spec_helper'
+
+module Moodle2CC
+  describe Moodle2Converter::LabelConverter do
+    let(:moodle_label) { Moodle2::Models::Label.new }
+
+    describe '#convert_to_module_items' do
+      it 'converts a moodle label with intro content to a wiki page module item' do
+        subject.stub(:generate_unique_identifier) { 'some_random_id' }
+
+        moodle_label.id = '1'
+        moodle_label.name = 'label title'
+        moodle_label.intro = '<div>hey look i have html content</div>'
+        moodle_label.visible = true
+
+        module_items = subject.convert_to_module_items(moodle_label)
+        expect(module_items.size).to eq 1
+
+        module_item = module_items.first
+
+        expect(module_item.identifier).to eq 'some_random_id'
+        expect(module_item.workflow_state).to eq 'active'
+        expect(module_item.title).to eq 'label title'
+        expect(module_item.identifierref).to eq "m2#{Digest::MD5.hexdigest(moodle_label.id.to_s)}"
+        expect(module_item.content_type).to eq 'WikiPage'
+        expect(module_item.indent).to eq '0'
+      end
+
+      it 'converts a plain moodle label to a title module item' do
+        subject.stub(:generate_unique_identifier) { 'some_random_id' }
+
+        moodle_label.id = '1'
+        moodle_label.name = 'label title'
+        moodle_label.intro = '<hr>'
+        moodle_label.visible = true
+
+        module_items = subject.convert_to_module_items(moodle_label)
+        expect(module_items.size).to eq 1
+
+        module_item = module_items.first
+
+        expect(module_item.identifier).to eq 'some_random_id'
+        expect(module_item.workflow_state).to eq 'active'
+        expect(module_item.title).to eq 'label title'
+        expect(module_item.identifierref).to be_nil
+        expect(module_item.content_type).to eq 'ContextModuleSubHeader'
+        expect(module_item.indent).to eq '0'
+      end
+    end
+
+    describe '#convert_to_pages' do
+      it 'converts a moodle label with intro content to a page' do
+        subject.stub(:generate_unique_identifier) { 'some_random_id' }
+
+        moodle_label.id = '1'
+        moodle_label.name = 'label title'
+        moodle_label.intro = '<div>hey look i also have html content</div>'
+        moodle_label.visible = true
+
+        pages = subject.convert_to_pages(moodle_label)
+        expect(pages.size).to eq 1
+
+        page = pages.first
+
+        expect(page.identifier).to eq "m2#{Digest::MD5.hexdigest(moodle_label.id.to_s)}"
+        expect(page.workflow_state).to eq 'active'
+        expect(page.title).to eq 'label title'
+        expect(page.editing_roles).to eq CanvasCC::Models::Page::EDITING_ROLE_TEACHER
+        expect(page.body).to eq moodle_label.intro
+        expect(page.href).to end_with("label-title.html")
+      end
+
+      it 'does not convert a plain moodle label to a page' do
+        subject.stub(:generate_unique_identifier) { 'some_random_id' }
+
+        moodle_label.id = '1'
+        moodle_label.name = 'label title'
+        moodle_label.intro = '<hr>'
+        moodle_label.visible = true
+
+        pages = subject.convert_to_pages(moodle_label)
+        expect(pages.size).to eq 0
+      end
+    end
+  end
+end

data/spec/moodle2cc/moodle2converter/migrator_spec.rb

@@ -144,10 +144,12 @@ module Moodle2CC
         end
 
         it 'converts assignments' do
+          moodle_course.show_grades = false
           canvas_course.assignments = [Moodle2CC::CanvasCC::Models::Assignment.new, Moodle2CC::CanvasCC::Models::Assignment.new]
           migrator.migrate
           expect(converter).to have_received(:convert).exactly(2)
           canvas_course.assignments.each{|assignment| expect(assignment.body).to eq 'converted_html'}
+          canvas_course.assignments.each{|assignment| expect(assignment.muted).to eq true}
         end
 
         it 'converts assessment' do

data/spec/moodle2cc/moodle2converter/question_bank_converter_spec.rb

@@ -38,7 +38,7 @@ describe Moodle2CC::Moodle2Converter::QuestionBankConverter do
 
     canvas_group = canvas_bank.question_groups.first
     expect(canvas_group.questions.count).to eq 2
-    expect(canvas_group.questions.detect{|q| q.identifier == question1.id}).not_to be_nil
-    expect(canvas_group.questions.detect{|q| q.identifier == question2.id}).not_to be_nil
+    expect(canvas_group.questions.detect{|q| q.original_identifier == question1.id}).not_to be_nil
+    expect(canvas_group.questions.detect{|q| q.original_identifier == question2.id}).not_to be_nil
   end
 end

data/spec/moodle2cc/moodle2converter/question_converters/calculated_converter_spec.rb

@@ -17,7 +17,7 @@ module Moodle2CC::Moodle2Converter::QuestionConverters
 
       converted_question = QuestionConverter.new.convert(moodle_question)
 
-      expect(converted_question.identifier).to eq moodle_question.id
+      expect(converted_question.original_identifier).to eq moodle_question.id
       expect(converted_question.answers.count).to eq moodle_question.answers.count
       expect(converted_question.answers.first.id).to eq moodle_question.answers.first.id
       expect(converted_question.dataset_definitions).to eq moodle_question.dataset_definitions