mumuki-laboratory 5.13.0 → 6.0.0

data/spec/models/exercise_spec.rb

@@ -263,7 +263,7 @@ describe Exercise, organization_workspace: :test do
         end
 
         context 'and test is nil'  do
-          let(:exercise) { create(:exercise, test: nil, expectations: [{}]) }
+          let(:exercise) { create(:exercise, test: nil, expectations: [{binding: "program", inspection: 'Uses:foo'}]) }
 
           it { expect(assignment.test).to eq nil }
         end
@@ -435,8 +435,6 @@ describe Exercise, organization_workspace: :test do
       it { expect(problem.messages_url_for(student))
              .to eq 'http://test.classroom-api.localmumuki.io/api/guides/mumuki/myguide/32/student/twitter%7C12134342/messages?language=haskell' }
     end
-
-
   end
 
   describe '#splitted_description' do
@@ -444,4 +442,29 @@ describe Exercise, organization_workspace: :test do
     it { expect(exercise.description_context).to eq "<p><strong>Foo</strong></p>\n" }
     it { expect(exercise.description_task).to eq "<p><em>Bar</em></p>\n" }
   end
+
+  describe '#validate!' do
+    context 'non-empty, valid randomizations' do
+      let(:exercise) { build(:exercise,
+                            randomizations: {
+                              some_word: { type: :one_of, value: %w('some' 'word') },
+                              some_number: { type: :range, value: [1, 10] } }) }
+      it { expect { exercise.validate! }.not_to raise_error }
+    end
+
+    context 'empty inspections' do
+      let(:exercise) { build(:exercise, expectations: [{ "binding" => "program", "inspection" => "" }]) }
+      it { expect { exercise.validate! }.to raise_error(/expectations format is invalid/i) }
+    end
+
+    context 'invalid assistance_rules' do
+      let(:exercise) { build(:exercise, assistance_rules: [{ when: 'content_empty', then: ['asd'] }]) }
+      it { expect { exercise.validate! }.to raise_error(/assistance rules format is invalid/i) }
+    end
+
+    context 'invalid randomizations' do
+      let(:exercise) { build(:exercise, randomizations: { type: :range, value: [1] }) }
+      it { expect { exercise.validate! }.to raise_error(/randomizations format is invalid/i) }
+    end
+  end
 end

data/spec/models/guide_import_spec.rb

@@ -6,11 +6,11 @@ describe Guide do
   let!(:gobstones) { create(:gobstones) }
   let(:reloaded_exercise_1) { Exercise.find(exercise_1.id) }
 
-  let(:guide_json) do
+  let(:guide_resource_h) do
     {name: 'sample guide',
      description: 'Baz',
      slug: 'mumuki/sample-guide',
-     language: 'haskell',
+     language: { name: 'haskell' },
      locale: 'en',
      extra: 'bar',
      teacher_info: 'an info',
@@ -23,7 +23,7 @@ describe Guide do
           tag_list: %w(baz bar),
           layout: 'input_bottom',
           teacher_info: 'an info',
-          language: 'gobstones',
+          language: { name: 'gobstones' },
           solution: 'foo',
           assistance_rules: [
             {when: :content_empty, then: 'remember to copy the code in the editor!'},
@@ -53,7 +53,7 @@ describe Guide do
           name: 'Choice',
           tag_list: %w(bar),
           extra: '',
-          language: 'text',
+          language: { name: 'text' },
           test: "---\nequal: '1'\n",
           choices: [{value: 'foo', checked: false}, {value: 'bar', chekced: true}],
           extra_visible: false,
@@ -64,13 +64,13 @@ describe Guide do
           expectations: [],
           choices: [],
           tag_list: %w(bar),
-          language: 'text',
+          language: { name: 'text' },
           layout: 'input_bottom',
           extra_visible: false,
-          id: 9}]}.deep_stringify_keys
+          id: 9}]}
   end
 
-  describe '#import_from_json!' do
+  describe '#import_from_resource_h!' do
     context 'when an exercise is deleted' do
       let(:guide) { create(:guide, exercises: [exercise_1, exercise_2, exercise_3, exercise_4, exercise_5, exercise_6]) }
 
@@ -111,7 +111,7 @@ describe Guide do
                                 number: 6) }
 
       before do
-        guide.import_from_json!(guide_json)
+        guide.import_from_resource_h!(guide_resource_h)
       end
 
       describe 'it is removed from the guide' do
@@ -129,7 +129,7 @@ describe Guide do
       let(:guide) { lesson.guide }
 
       before do
-        guide.import_from_json!(guide_json)
+        guide.import_from_resource_h!(guide_resource_h)
       end
 
       it { expect(guide).to_not be nil }
@@ -159,7 +159,7 @@ describe Guide do
       let(:guide) { create(:guide, language: haskell, exercises: [exercise_1]) }
 
       before do
-        guide.import_from_json! guide_json
+        guide.import_from_resource_h! guide_resource_h
       end
 
       context 'when exercise changes its type' do
@@ -241,7 +241,7 @@ describe Guide do
       let(:reloaded_exercise_2) { Exercise.find(exercise_2.id) }
 
       before do
-        guide.import_from_json! guide_json
+        guide.import_from_resource_h! guide_resource_h
       end
 
       describe 'exercises are not duplicated' do
@@ -267,11 +267,11 @@ describe Guide do
 
     context 'when new_expecations' do
       let(:guide) { create(:guide, language: haskell) }
-      let(:guide_json) do
+      let(:guide_resource_h) do
         {name: 'sample guide',
          description: 'Baz',
          slug: 'mumuki/sample-guide',
-         language: 'haskell',
+         language: { name: 'haskell' },
          locale: 'en',
          extra: 'bar',
          teacher_info: 'an info',
@@ -285,11 +285,11 @@ describe Guide do
               type: 'problem',
               expectations: [{inspection: 'HasBinding', binding: 'foo'}],
               new_expectations: true,
-              id: 2}]}.deep_stringify_keys
+              id: 2}]}
       end
 
       before do
-        guide.import_from_json! guide_json
+        guide.import_from_resource_h! guide_resource_h
       end
 
       it { expect(guide.exercises.first.new_expectations).to be_truthy }

data/spec/models/guide_spec.rb

@@ -24,10 +24,60 @@ describe Guide, organization_workspace: :test do
     end
   end
 
-  describe '#submission_contents_for' do
-    before do
-      guide.exercises = [create(:exercise, language: guide.language), create(:exercise, language: guide.language)]
-      guide.save!
+  describe '#fork!' do
+    let(:syncer) { double(:syncer) }
+    let!(:guide_from) { create :guide, slug: 'foo/bar' }
+    let(:slug_from) { guide_from.slug }
+    let(:slug_to) { 'baz/bar'.to_mumukit_slug }
+    let(:guide_to) { Guide.find_by_slug! slug_to.to_s }
+    let!(:guide) { create(:guide, slug: 'test/bar') }
+
+    context 'fork works' do
+      before { expect(syncer).to receive(:export!).with(instance_of(Guide)) }
+      before { Guide.find_by_slug!(slug_from).fork_to! 'baz', syncer }
+      it { expect(guide_from.to_resource_h).to json_eq guide_to.to_resource_h, except: [:slug] }
+    end
+
+    context 'fork does not work if guide already exists' do
+      before { expect(syncer).to_not receive(:export!) }
+      it { expect { Guide.find_by_slug!(slug_from).fork_to! 'test', syncer }.to raise_error ActiveRecord::RecordInvalid }
+    end
+  end
+
+  describe '#to_markdownified_resource_h' do
+    subject { guide.to_markdownified_resource_h }
+    context 'description' do
+      let(:guide) { create(:guide, description: '`foo = (+)`') }
+      it { expect(subject[:description]).to eq("<p><code>foo = (+)</code></p>\n") }
+    end
+    context 'corollary' do
+      let(:guide) { create(:guide, corollary: '[Google](https://google.com)') }
+      it { expect(subject[:corollary]).to eq("<p><a title=\"\" href=\"https://google.com\" target=\"_blank\">Google</a></p>\n") }
+    end
+    context 'teacher_info' do
+      let(:guide) { create(:guide, teacher_info: '**foo**') }
+      it { expect(subject[:teacher_info]).to eq("<p><strong>foo</strong></p>\n") }
+    end
+    context 'exercises' do
+      let(:guide) { create(:guide, exercises: [exercise]) }
+      subject { guide.to_markdownified_resource_h[:exercises].first }
+
+      context 'description' do
+        let(:exercise) { build(:exercise, description: '`foo = (+)`') }
+        it { expect(subject[:description]).to eq("<p><code>foo = (+)</code></p>\n") }
+      end
+      context 'corollary' do
+        let(:exercise) { build(:exercise, corollary: '[Google](https://google.com)') }
+        it { expect(subject[:corollary]).to eq("<p><a title=\"\" href=\"https://google.com\" target=\"_blank\">Google</a></p>\n") }
+      end
+      context 'teacher_info' do
+        let(:exercise) { build(:exercise, teacher_info: '**foo**') }
+        it { expect(subject[:teacher_info]).to eq("<p><strong>foo</strong></p>\n") }
+      end
+      context 'hint' do
+        let(:exercise) { build(:exercise, hint: '***foo***') }
+        it { expect(subject[:hint]).to eq("<p><strong><em>foo</em></strong></p>\n") }
+      end
     end
   end
 end

data/spec/models/language_spec.rb

@@ -1,15 +1,22 @@
 require 'spec_helper'
 
 describe Language do
-  let!(:gobstones) { create(:language, name: 'Gobstones') }
+  describe 'name uniqness' do
+    let!(:gobstones) { create(:language, name: 'Gobstones') }
 
-  it { expect { create :language, name: 'gobstones' }.to raise_exception(ActiveRecord::RecordInvalid) }
-  it { expect(Language.for_name 'gobstones').to eq gobstones }
-  it { expect(Language.for_name nil).to be nil}
+    it { expect { create :language, name: 'gobstones' }.to raise_exception(ActiveRecord::RecordInvalid) }
+    it { expect(Language.for_name 'gobstones').to eq gobstones }
+    it { expect(Language.for_name nil).to be nil}
+  end
 
   describe '#import!' do
-    let(:ruby) { create(:language, name: 'ruby') }
-    let(:response) do
+    let(:bridge) { Mumukit::Bridge::Runner.new('http://runner.com') }
+    before { expect(bridge).to receive(:info).and_return response }
+    before { subject.import_from_resource_h! bridge.importable_info }
+
+    context 'non graphical language' do
+      subject { create(:language, name: 'ruby') }
+      let(:response) do
       {
           'name' => 'ruby',
           'version' => 'master',
@@ -40,24 +47,21 @@ describe Language do
           },
           'url' => 'http://ruby.runners.mumuki.io/info'
       }
-    end
+      end
 
-    before { allow_any_instance_of(Mumukit::Bridge::Runner).to receive(:info).and_return response }
-    before { ruby.import! }
-
-    it { expect(ruby.name).to eq 'ruby' }
-    it { expect(ruby.queriable).to be true }
-    it { expect(ruby.output_content_type).to eq Mumukit::ContentType::Markdown }
-    it { expect(ruby.visible_success_output).to be false }
-    it { expect(ruby.highlight_mode).to eq 'ruby' }
-    it { expect(ruby.devicon).to eq 'ruby' }
-    it { expect(ruby.prompt).to eq '> ' }
-    it { expect(ruby.stateful_console).to be true }
-  end
+      it { expect(subject.name).to eq 'ruby' }
+      it { expect(subject.queriable).to be true }
+      it { expect(subject.output_content_type).to eq Mumukit::ContentType::Markdown }
+      it { expect(subject.visible_success_output).to be false }
+      it { expect(subject.highlight_mode).to eq 'ruby' }
+      it { expect(subject.devicon).to eq 'ruby' }
+      it { expect(subject.prompt).to eq '> ' }
+      it { expect(subject.stateful_console).to be true }
+    end
 
-  describe '#import!' do
-    let(:gobstones) { create(:language, name: 'gobstones', runner_url: 'runner.com') }
-    let(:response) do
+    context 'graphical language' do
+      subject { create(:language, name: 'gobstones', runner_url: 'http://runner.com') }
+      let(:response) do
       {
           'name' => 'gobstones',
           'version' => 'master',
@@ -74,14 +78,14 @@ describe Language do
               'structured' => true
           },
           'layout_assets_urls' => {
-            'js' => ['javascripts/a.js'],
-            'html' => ['b.html', 'c.html'],
-            'css' => ['stylesheets/d.css']
+              'js' => ['javascripts/a.js'],
+              'html' => ['b.html', 'c.html'],
+              'css' => ['stylesheets/d.css']
           },
           'editor_assets_urls' => {
-            'js' => ['javascripts/aa.js'],
-            'html' => ['bb.html', 'cc.html'],
-            'css' => ['stylesheets/dd.css']
+              'js' => ['javascripts/aa.js'],
+              'html' => ['bb.html', 'cc.html'],
+              'css' => ['stylesheets/dd.css']
           },
           'language' => {
               'name' => 'gobstones',
@@ -96,24 +100,22 @@ describe Language do
           },
           'url' => 'http://runners2.mumuki.io:8001/info'
       }
-    end
+      end
 
-    before { allow_any_instance_of(Mumukit::Bridge::Runner).to receive(:info).and_return response }
-    before { gobstones.import! }
-
-    it { expect(gobstones.name).to eq 'gobstones' }
-    it { expect(gobstones.queriable).to be false }
-    it { expect(gobstones.output_content_type).to eq Mumukit::ContentType::Html }
-    it { expect(gobstones.visible_success_output).to be true }
-    it { expect(gobstones.highlight_mode).to eq 'gobstones' }
-    it { expect(gobstones.devicon).to eq 'gobstones' }
-    it { expect(gobstones.prompt).to eq 'ム ' }
-    it { expect(gobstones.stateful_console).to be false }
-    it { expect(gobstones.layout_js_urls).to eq ['runner.com/javascripts/a.js'] }
-    it { expect(gobstones.layout_html_urls).to eq ['runner.com/b.html', 'runner.com/c.html'] }
-    it { expect(gobstones.layout_css_urls).to eq ['runner.com/stylesheets/d.css'] }
-    it { expect(gobstones.editor_js_urls).to eq ['runner.com/javascripts/aa.js'] }
-    it { expect(gobstones.editor_html_urls).to eq ['runner.com/bb.html', 'runner.com/cc.html'] }
-    it { expect(gobstones.editor_css_urls).to eq ['runner.com/stylesheets/dd.css'] }
+      it { expect(subject.name).to eq 'gobstones' }
+      it { expect(subject.queriable).to be false }
+      it { expect(subject.output_content_type).to eq Mumukit::ContentType::Html }
+      it { expect(subject.visible_success_output).to be true }
+      it { expect(subject.highlight_mode).to eq 'gobstones' }
+      it { expect(subject.devicon).to eq 'gobstones' }
+      it { expect(subject.prompt).to eq 'ム ' }
+      it { expect(subject.stateful_console).to be false }
+      it { expect(subject.layout_js_urls).to eq ['http://runner.com/javascripts/a.js'] }
+      it { expect(subject.layout_html_urls).to eq ['http://runner.com/b.html', 'http://runner.com/c.html'] }
+      it { expect(subject.layout_css_urls).to eq ['http://runner.com/stylesheets/d.css'] }
+      it { expect(subject.editor_js_urls).to eq ['http://runner.com/javascripts/aa.js'] }
+      it { expect(subject.editor_html_urls).to eq ['http://runner.com/bb.html', 'http://runner.com/cc.html'] }
+      it { expect(subject.editor_css_urls).to eq ['http://runner.com/stylesheets/dd.css'] }
+    end
   end
 end

data/spec/models/message_spec.rb

@@ -21,7 +21,7 @@ describe Message, organization_workspace: :test do
     it { expect(parsed_comment).to eq(expected_json) }
   end
 
-  describe '.import_from_json!' do
+  describe '.import_from_resource_h!' do
     let(:user) { create(:user) }
     let(:problem) { create(:problem) }
 
@@ -39,10 +39,10 @@ describe Message, organization_workspace: :test do
            'content' => 'a',
            'created_at' => '1/1/1'}} }
 
-      before { Message.import_from_json! data }
+      before { Message.import_from_resource_h! data }
       before do
         assignment = problem.submit_solution! user, content: ''
-        Message.import_from_json! 'exercise_id' => problem.id,
+        Message.import_from_resource_h! 'exercise_id' => problem.id,
                                   'submission_id' => assignment.submission_id,
                                   'organization' => Organization.current.name,
                                   'message' => {
@@ -54,7 +54,7 @@ describe Message, organization_workspace: :test do
       it { expect(Message.count).to eq 1 }
       it { expect(message.assignment).to_not be_nil }
       it { expect(message.assignment).to eq final_assignment }
-      it { expect(message.as_platform_json.except 'created_at', 'updated_at', 'date')
+      it { expect(message.to_resource_h.except 'created_at', 'updated_at', 'date')
              .to json_like submission_id: message.submission_id,
                            content: 'a',
                            sender: 'teacher@mumuki.org',
@@ -77,7 +77,7 @@ describe Message, organization_workspace: :test do
            'created_at' => '1/1/1'}} }
 
       before { problem.submit_solution! user, content: 'other solution' }
-      before { Message.import_from_json! data }
+      before { Message.import_from_resource_h! data }
 
       it { expect(Message.count).to eq 0 }
       it { expect(Assignment.first.has_messages?).to be false }

data/spec/models/query_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe Query do
+describe Mumuki::Domain::Submission::Query do
   let!(:exercise) { create(:exercise) }
   let(:user) { create(:user) }
 
   before do
-    expect_any_instance_of(Challenge).to receive(:automated_evaluation_class).and_return(Mumuki::Laboratory::Evaluation::Automated)
+    expect_any_instance_of(Challenge).to receive(:automated_evaluation_class).and_return(Mumuki::Domain::Evaluation::Automated)
     allow_any_instance_of(Language).to receive(:run_query!).and_return(status: :passed, result: '5')
   end
 

data/spec/models/question_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Query, organization_workspace: :test do
+describe Mumuki::Domain::Submission::Query, organization_workspace: :test do
   let!(:exercise) { create(:problem) }
   let(:student) { create(:user) }
 

data/spec/models/solution_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Solution, organization_workspace: :test do
+describe Mumuki::Domain::Submission::Solution, organization_workspace: :test do
 
   let(:user) { create(:user) }
 
@@ -36,7 +36,7 @@ describe Solution, organization_workspace: :test do
 
   describe '#submit_solution!' do
 
-    before { expect_any_instance_of(Challenge).to receive(:automated_evaluation_class).and_return(Mumuki::Laboratory::Evaluation::Automated) }
+    before { expect_any_instance_of(Challenge).to receive(:automated_evaluation_class).and_return(Mumuki::Domain::Evaluation::Automated) }
     before { expect_any_instance_of(Language).to receive(:run_tests!).and_return(bridge_response) }
 
     context 'when results have no expectation' do

data/spec/models/topic_import_spec.rb

@@ -17,15 +17,15 @@ describe Guide do
      description: 'topic description',
      slug: 'mumuki/mumuki-sample-topic',
      locale: 'en',
-     lessons: [guide_2, guide_1, guide_3].map(&:slug)}.deep_stringify_keys
+     lessons: [guide_2, guide_1, guide_3].map(&:slug)}
   end
 
-  describe '#import_from_json!' do
+  describe '#import_from_resource_h!' do
     context 'when guide is empty' do
       let(:topic) { create(:topic, lessons: [lesson_1, lesson_2]) }
 
       before do
-        topic.import_from_json!(topic_json)
+        topic.import_from_resource_h!(topic_json)
       end
 
       it { expect(topic.name).to eq 'sample topic' }