moodle2cc 0.2.5 → 0.2.6

data/spec/moodle2cc/moodle2/models/label_spec.rb

@@ -33,16 +33,16 @@ module Moodle2CC::Moodle2::Models
         subject.name = ("a" * 50) + "..."
         subject.intro = ("a" * 70)
 
-        expect(subject.converted_title).to eq ("a" * 70)
+        expect(subject.converted_title).to eq subject.intro
         expect(subject.convert_to_page?).to eq false
         expect(subject.convert_to_header?).to eq true
       end
 
-      it 'should truncate the intro text if it is too long' do
+      it 'should convert to page if the intro text is too long' do
         subject.name = '<hr>'
-        subject.intro = ("a" * 90)
+        subject.intro = ("a" * (Moodle2CC::Moodle2Converter::ConverterHelper::MAX_TITLE_LENGTH + 20))
 
-        expect(subject.converted_title).to eq (("a" * 80) + '...')
+        expect(subject.converted_title).to eq subject.intro
         expect(subject.convert_to_page?).to eq true
         expect(subject.convert_to_header?).to eq false
       end

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

@@ -44,6 +44,16 @@ describe Moodle2CC::Moodle2::Parsers::ParserHelper do
       expect(subject.parse_text(parent_node, 'path')).to eq nil
     end
 
+    it "replaces the @$FILEPHP$@ token with $IMS_CC_FILEBASE$" do
+      child_node.stub(:text) { "<a href=\"$@FILEPHP@$/somefile\">linkylink</a>" }
+      expect(subject.parse_text(parent_node, 'path')).to eq "<a href=\"$IMS_CC_FILEBASE$/somefile\">linkylink</a>"
+    end
+
+    it "replaces the @$SLASH$@ token with a slash" do
+      child_node.stub(:text) { "<a href=\"something$@SLASH@$somefile\">linkylink</a>" }
+      expect(subject.parse_text(parent_node, 'path')).to eq "<a href=\"something/somefile\">linkylink</a>"
+    end
+
     it "uses #at_xpath when ns is true" do
       expect(subject.parse_text(parent_node, 'path', true)).to eq 'value'
       expect(parent_node).to have_received(:at_xpath).with('path')

data/spec/moodle2cc/moodle2/parsers/question_parsers/calculated_parser_spec.rb

@@ -36,6 +36,12 @@ module Moodle2CC::Moodle2
       var2 = question.dataset_definitions[1]
       expect(var2[:name]).to eq 'B'
       expect(var2[:options]).to eq 'uniform:1:10:1'
+
+      expect(question.var_sets.count).to eq 1
+      set = question.var_sets.first
+      expect(set[:ident]).to eq '1'
+      expect(set[:vars]["A"]).to eq "3.5"
+      expect(set[:vars]["B"]).to eq "3.1"
     end
 
     it 'parses a calculated multiple choice question into a standard calculated question' do
@@ -58,6 +64,12 @@ module Moodle2CC::Moodle2
       var2 = question.dataset_definitions[1]
       expect(var2[:name]).to eq 'B'
       expect(var2[:options]).to eq 'uniform:1:10:1'
+
+      expect(question.var_sets.count).to eq 1
+      set = question.var_sets.first
+      expect(set[:ident]).to eq '1'
+      expect(set[:vars]["A"]).to eq "5.1"
+      expect(set[:vars]["B"]).to eq "7.1"
     end
 
     it 'parses a calculated simple question' do
@@ -78,6 +90,11 @@ module Moodle2CC::Moodle2
       var = question.dataset_definitions.first
       expect(var[:name]).to eq 'A'
       expect(var[:options]).to eq 'uniform:1.0:10.0:1'
+
+      expect(question.var_sets.count).to eq 1
+      set = question.var_sets.first
+      expect(set[:ident]).to eq '1'
+      expect(set[:vars]["A"]).to eq "3.6"
     end
   end
 end

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

@@ -27,6 +27,10 @@ describe Moodle2CC::Moodle2::Parsers::QuestionnaireParser do
 
     expect(question.choices.count).to eq 3
     expect(question.choices.first).to eq ({:id => '1', :content => 'possible answer 1'})
+
+    rating_question = questionnaire.questions.detect{|q| q.id == "8"}
+    rating_question.length.should == "5"
+    rating_question.precise.should == "0"
   end
 
 end

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

@@ -52,7 +52,7 @@ describe Moodle2CC::Moodle2::Parsers::QuizParser do
     expect(quiz.visible).to eq true
 
     expect(quiz.question_instances.map{|q| q[:question]}).to eq (
-      ['1', '2', '3', '4', '10', '11', '12', '13', '14', '15', '17']
+      ['1', '3', '2', '4', '10', '11', '12', '13', '14', '15', '17']
     )
     expect(quiz.question_instances.map{|q| q[:grade]}).to eq (
       ["1.0000000", "1.0000000", "1.0000000", "5.0000000", "1.0000000",

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

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Moodle2CC::Moodle2::Parsers::WikiParser do
+  subject(:parser) {Moodle2CC::Moodle2::Parsers::WikiParser.new(fixture_path(File.join('moodle2', 'backup')))}
+
+  it 'parses a moodle2 wiki' do
+    wikis = parser.parse
+    expect(wikis.count).to eq 1
+    wiki = wikis.first
+
+    expect(wiki.module_id).to eq '58541'
+    expect(wiki.id).to eq '19'
+    expect(wiki.name).to eq 'wiki name'
+    expect(wiki.intro).to eq "<p>wiki page description.</p>"
+    expect(wiki.intro_format).to eq '1'
+    expect(wiki.visible).to eq true
+    expect(wiki.first_page_title).to eq 'Main Page'
+    pages = [{:id => '27', :title => "Main Page", :content => "<p>front page content</p>"},
+             {:id => '28', :title => "other page", :content => "<p>other page content</p>"}]
+    expect(wiki.pages).to eq pages
+  end
+
+end

data/spec/moodle2cc/moodle2converter/assessment_converter_spec.rb

@@ -16,7 +16,7 @@ describe Moodle2CC::Moodle2Converter::AssessmentConverter do
     moodle_quiz.password = "password"
     moodle_quiz.subnet = "255.255.255.0"
     moodle_quiz.shuffle_answers = false
-    moodle_quiz.time_limit = "100"
+    moodle_quiz.time_limit = "120"
     moodle_quiz.visible = false
 
     canvas_assessment = subject.convert_quiz(moodle_quiz)
@@ -33,7 +33,7 @@ describe Moodle2CC::Moodle2Converter::AssessmentConverter do
     expect(canvas_assessment.access_code).to eq moodle_quiz.password
     expect(canvas_assessment.ip_filter).to eq moodle_quiz.subnet
     expect(canvas_assessment.shuffle_answers).to eq moodle_quiz.shuffle_answers
-    expect(canvas_assessment.time_limit).to eq 100
+    expect(canvas_assessment.time_limit).to eq 2 # moodle time limit is in seconds
     expect(canvas_assessment.quiz_type).to eq 'practice_quiz'
     expect(canvas_assessment.question_references).to eq moodle_quiz.question_instances
     expect(canvas_assessment.workflow_state).to eq Moodle2CC::CanvasCC::Models::WorkflowState::UNPUBLISHED
@@ -101,6 +101,8 @@ describe Moodle2CC::Moodle2Converter::AssessmentConverter do
     question2.name = 'q name 2'
     question2.content = 'question2 text'
     question2.type_id = '8'
+    question2.length = '3'
+    question2.precise = '1'
     question2.choices = [{:id => '4', :content => 'choice3'}, {:id => '5', :content => 'choice4'}]
 
     moodle_questionnaire.questions = [question1, question2]
@@ -126,13 +128,16 @@ describe Moodle2CC::Moodle2Converter::AssessmentConverter do
     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.question_type).to eq 'multiple_dropdowns_question'
+    expect(canvas_question2.material).to eq question2.content + "<p>choice3 [response1]</p><p>choice4 [response2]</p>"
     expect(canvas_question2.title).to eq question2.name
-    expect(canvas_question2.answers.count).to eq 2
+    expect(canvas_question2.answers.count).to eq 0
 
-    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]})
+    expect(canvas_question2.responses.count).to eq 2
+    expect(canvas_question2.responses.map{|r| r[:id]}).to eq ["response1", "response2"]
+    canvas_question2.responses.each do |response|
+      expect(response[:choices].map{|c| c[:text]}).to eq ["1", "2", "3", "N/A"]
+    end
   end
 
   it "should convert a moodle2 feedback activity to an ungraded assessment" do

data/spec/moodle2cc/moodle2converter/converter_helper_spec.rb

@@ -168,6 +168,11 @@ module Moodle2CC
 
     end
 
+    describe '#truncate_text' do
+      it 'should truncate text' do
+        expect(subject.truncate_text('truncate me', 8)).to eq 'trunc...'
+      end
+    end
 
   end
 end

data/spec/moodle2cc/moodle2converter/html_converter_spec.rb

@@ -38,7 +38,7 @@ module Moodle2CC
       expect(html.css('img').first.attr('src')).to eq '%24IMS_CC_FILEBASE%24/path/a'
     end
 
-    it 'replaces moodle 2 url in hrefs with cavans url' do
+    it 'replaces moodle 2 url in hrefs with canvas url' do
       content = '<p>a link to <a href="@@PLUGINFILE@@/a97"></p>'
       html = Nokogiri::HTML.fragment(subject.convert(content))
       expect(html.css('a[href]').first.attr('href')).to eq '%24IMS_CC_FILEBASE%24/path/a'
@@ -179,8 +179,13 @@ module Moodle2CC
 
         expect(html).to eq '<audio controls="controls"><source src="/some/path/to/video.webm" type="video/webm"></source><a href="/some/path/to/video.webm">My Video</a></audio>'
       end
-   end
+    end
 
+    it 'converts equations into canvas equations' do
+      content = 'stuff $$a + b$$'
+      html = subject.convert(content)
+      expect(html).to eq "stuff <img class=\"equation_image\" title=\"a + b\" alt=\"a + b\" src=\"/equation_images/a%2520%252B%2520b\">"
+    end
 
   end
 end

data/spec/moodle2cc/moodle2converter/label_converter_spec.rb

@@ -81,6 +81,23 @@ module Moodle2CC
         pages = subject.convert_to_pages(moodle_label)
         expect(pages.size).to eq 0
       end
+
+      it 'truncates titles that are too long' do
+        subject.stub(:generate_unique_identifier) { 'some_random_id' }
+
+        moodle_label.id = '1'
+        moodle_label.name = ''
+        moodle_label.intro = 'a' * 500
+        moodle_label.visible = true
+
+        pages = subject.convert_to_pages(moodle_label)
+        expect(pages.size).to eq 1
+
+        page = pages.first
+
+        expect(page.title.length).to eq Moodle2CC::Moodle2Converter::ConverterHelper::MAX_TITLE_LENGTH
+        expect(page.body).to eq moodle_label.intro
+      end
     end
   end
 end

data/spec/moodle2cc/moodle2converter/migrator_spec.rb

@@ -21,11 +21,12 @@ module Moodle2CC
       Moodle2Converter::SectionConverter.any_instance.stub(:convert)
       Moodle2Converter::FileConverter.any_instance.stub(:convert)
       Moodle2Converter::PageConverter.any_instance.stub(:convert)
+      Moodle2Converter::WikiConverter.any_instance.stub(:convert)
       Moodle2Converter::DiscussionConverter.any_instance.stub(:convert)
       Moodle2Converter::AssignmentConverter.any_instance.stub(:convert)
       Moodle2Converter::FolderConverter.any_instance.stub(:convert)
       Moodle2Converter::BookConverter.any_instance.stub(:convert_to_pages)
-      Moodle2CC::CanvasCC::Models::Assessment.any_instance.stub(:resolve_question_references)
+      Moodle2CC::CanvasCC::Models::Assessment.any_instance.stub(:resolve_question_references!)
       Moodle2Converter::HtmlConverter.stub(:new) { double('html_converter', convert: true) }
       Moodle2Converter::GlossaryConverter.any_instance.stub(:convert)
       CanvasCC::CartridgeCreator.stub(:new).and_return(double(create: nil))
@@ -58,6 +59,13 @@ module Moodle2CC
         expect(canvas_course.pages.compact).to eq [canvas_page, canvas_page]
       end
 
+      it 'converts wikis' do
+        moodle_course.wikis = [:wiki1, :wiki2]
+        Moodle2Converter::WikiConverter.any_instance.stub(:convert).and_return([canvas_page, canvas_page])
+        migrator.migrate
+        expect(canvas_course.pages).to eq [canvas_page] * 4
+      end
+
       it 'converts discussions' do
         moodle_course.forums = [:discussion1, :discussion2]
         Moodle2Converter::DiscussionConverter.any_instance.stub(:convert).and_return(canvas_discussion)
@@ -121,6 +129,37 @@ module Moodle2CC
         end
       end
 
+      context '#resolve_duplicate_page_titles!' do
+        it "should order renumbering of page titles according to position in index" do
+          page1 = Moodle2CC::CanvasCC::Models::Page.new
+          page2 = Moodle2CC::CanvasCC::Models::Page.new
+          page3 = Moodle2CC::CanvasCC::Models::Page.new
+
+          canvas_course.pages = [page1, page2, page3]
+          canvas_course.pages.each_with_index do |page, idx|
+            page.identifier = idx.to_s
+            page.title = 'page title'
+          end
+
+          module1 = Moodle2CC::CanvasCC::Models::CanvasModule.new
+          module_item1 = Moodle2CC::CanvasCC::Models::ModuleItem.new
+          module_item1.identifierref = page3.identifier
+          module1.module_items = [module_item1]
+
+          module2 = Moodle2CC::CanvasCC::Models::CanvasModule.new
+          module_item2 = Moodle2CC::CanvasCC::Models::ModuleItem.new
+          module_item2.identifierref = page2.identifier
+          module2.module_items = [module_item2]
+
+          canvas_course.canvas_modules = [module1, module2]
+
+          migrator.migrate
+
+          expect(page3.title).to eq 'page title'
+          expect(page2.title).to eq 'page title-2'
+          expect(page1.title).to eq 'page title-3'
+        end
+      end
 
       context "html conversion" do
         let(:converter){double('invitation', :convert => 'converted_html')}
@@ -157,11 +196,53 @@ module Moodle2CC
           migrator.migrate
           expect(converter).to have_received(:convert).exactly(2)
           canvas_course.assessments.each do |assessment|
-            expect(assessment).to have_received(:resolve_question_references).exactly(1)
+            expect(assessment).to have_received(:resolve_question_references!).exactly(1)
             expect(assessment.description).to eq 'converted_html'
           end
         end
 
+        it 'converts assessment questions' do
+          assmt = Moodle2CC::CanvasCC::Models::Assessment.new
+          q1 = Moodle2CC::CanvasCC::Models::Question.new
+          a1 = Moodle2CC::CanvasCC::Models::Answer.new
+          q1.answers = [a1]
+
+          q_group = Moodle2CC::CanvasCC::Models::QuestionGroup.new
+          q2 = Moodle2CC::CanvasCC::Models::Question.new
+          a2 = Moodle2CC::CanvasCC::Models::Answer.new
+          q2.answers = [a2]
+          q_group.questions = [q2]
+
+          assmt.items = [q1, q_group]
+          canvas_course.assessments = [assmt]
+          migrator.migrate
+
+          expect(q1.material).to eq 'converted_html'
+          expect(q2.material).to eq 'converted_html'
+          expect(a1.answer_text).to eq 'converted_html'
+          expect(a2.answer_text).to eq 'converted_html'
+        end
+
+        it 'converts question bank questions' do
+          qb = Moodle2CC::CanvasCC::Models::QuestionBank.new
+          q1 = Moodle2CC::CanvasCC::Models::CalculatedQuestion.new
+          q1.stub(:post_process!)
+          a1 = Moodle2CC::CanvasCC::Models::Answer.new
+          q1.general_feedback = 'a'
+          a1.feedback = 'a'
+
+          q1.answers = [a1]
+          qb.questions = [q1]
+
+          canvas_course.question_banks = [qb]
+          migrator.migrate
+
+          expect(q1).to have_received(:post_process!)
+          expect(q1.material).to eq 'converted_html'
+          expect(q1.general_feedback).to eq 'converted_html'
+          expect(a1.answer_text).to eq 'converted_html'
+          expect(a1.feedback).to eq 'converted_html'
+        end
       end
     end
 

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

@@ -11,6 +11,7 @@ module Moodle2CC::Moodle2Converter::QuestionConverters
       answer.id = 'blah'
       moodle_question.answers = [answer]
       moodle_question.dataset_definitions = ['mock datasets']
+      moodle_question.var_sets = ['mock varsets']
       moodle_question.correct_answer_format = '1'
       moodle_question.correct_answer_length = '2'
       moodle_question.tolerance = '3'
@@ -21,6 +22,7 @@ module Moodle2CC::Moodle2Converter::QuestionConverters
       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
+      expect(converted_question.var_sets).to eq moodle_question.var_sets
       expect(converted_question.correct_answer_format).to eq moodle_question.correct_answer_format
       expect(converted_question.correct_answer_length).to eq moodle_question.correct_answer_length
       expect(converted_question.tolerance).to eq moodle_question.tolerance

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

@@ -8,8 +8,7 @@ module Moodle2CC::Moodle2Converter::QuestionConverters
       moodle_question.id = 'something'
 
       moodle_question.matches = [{
-        :question_text => "This is **bold** and this is _italic_",
-        :question_text_format => '4',
+        :question_text => "<p>This is a bunch of html</p>",
         :answer_text => 'blah answer'
       }]
 
@@ -17,7 +16,7 @@ module Moodle2CC::Moodle2Converter::QuestionConverters
 
       expect(converted_question.original_identifier).to eq moodle_question.id
 
-      expected_text = "<p>This is <strong>bold</strong> and this is <em>italic</em></p>\n"
+      expected_text = "This is a bunch of html"
       expect(converted_question.matches.first[:question_text]).to eq expected_text
       expect(converted_question.matches.first[:answer_text]).to eq moodle_question.matches.first[:answer_text]
     end

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

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+module Moodle2CC::Moodle2Converter::QuestionConverters
+  describe MultichoiceConverter do
+
+    it 'converts multiple choice questions' do
+      moodle_question = Moodle2CC::Moodle2::Models::Quizzes::Question.create('multichoice')
+      moodle_question.id = 'something'
+      moodle_question.single = true
+
+      converted_question = QuestionConverter.new.convert(moodle_question)
+
+      expect(converted_question.question_type).to eq 'multiple_choice_question'
+    end
+
+    it 'converts multiple answer questions' do
+      moodle_question = Moodle2CC::Moodle2::Models::Quizzes::Question.create('multichoice')
+      moodle_question.id = 'something'
+      moodle_question.single = false
+
+      converted_question = QuestionConverter.new.convert(moodle_question)
+
+      expect(converted_question.question_type).to eq 'multiple_answers_question'
+    end
+  end
+end

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

@@ -73,9 +73,6 @@ module Moodle2CC::Moodle2Converter::QuestionConverters
 
       converted_question = converter.convert(Moodle2CC::Moodle2::Models::Quizzes::Question.create('shortanswer'))
       expect(converted_question.question_type).to eq 'short_answer_question'
-
-      converted_question = converter.convert(Moodle2CC::Moodle2::Models::Quizzes::Question.create('multichoice'))
-      expect(converted_question.question_type).to eq 'multiple_choice_question'
     end
 
   end

data/spec/moodle2cc/moodle2converter/wiki_converter_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+module Moodle2CC::Moodle2Converter
+  describe WikiConverter do
+    let(:moodle_wiki){Moodle2CC::Moodle2::Models::Wiki.new}
+
+    it 'converts a moodle wiki to canvas pages' do
+      moodle_wiki.id = 'page_id'
+      moodle_wiki.name = 'wiki name'
+      moodle_wiki.intro = '<h2>wiki description</h2>'
+      moodle_wiki.visible = true
+      moodle_wiki.first_page_title = 'first page name'
+
+      moodle_wiki.pages = [
+        {:id => '27', :title => "first page name", :content => "<p>front page content</p>"},
+        {:id => '28', :title => "other page", :content => "<p>other page content</p>"}
+      ]
+
+      canvas_pages = subject.convert(moodle_wiki)
+      expect(canvas_pages.count).to eq 2
+      first_page = canvas_pages.detect{|page| page.title == "wiki name"}
+      other_page = canvas_pages.detect{|page| page.title == "other page"}
+
+      expect(first_page.identifier).not_to eq other_page.identifier
+
+      canvas_pages.each do |canvas_page|
+        expect(canvas_page.workflow_state).to eq 'active'
+        expect(canvas_page.editing_roles).to eq 'teachers'
+      end
+
+      expect(other_page.body).to eq '<p>other page content</p>'
+      expect(first_page.body).to eq '<h2>wiki description</h2><p>front page content</p>'
+    end
+
+  end
+end