trackler 2.2.1.19 → 2.2.1.20

data/tracks/ocaml/tools/test-generator/test/ocaml_special_cases_test.ml

@@ -15,10 +15,6 @@ let stringify = function
   | _ -> failwith "Bad type for stringify"
 
 let ocaml_special_cases_tests = [
-  "for a non special cased slug convert the parameter to a string" >:: (fun _ctx ->
-      assert_equal ~printer:Fn.id "stringified" @@ ocaml_edit_expected ~stringify ~slug:"some-slug" ~value:(`Bool true)
-    );
-
   "an optional int parameter is converted to none if it matches the special value" >:: (fun _ctx ->
       assert_equal "None" @@ optional_int ~none:88 (`Int 88)
     );
@@ -40,4 +36,16 @@ let ocaml_special_cases_tests = [
       assert_equal ~printer:tuples_printer [("key", "(Some \"value\")"); ("key2", "\"value2\"")]
         @@ optional_strings ~f:(fun x -> x = "key") [("key", `String "value"); ("key2", `String "value2")]
     );
+
+  "option_of_null converts Null to None" >:: (fun _ctx ->
+      assert_equal "None" @@ option_of_null `Null
+    );
+  
+  "option_of_null converts String to Some" >:: (fun _ctx ->
+      assert_equal "(Some \"abc\")" @@ option_of_null (`String "abc")
+    );
+
+  "option_of_null converts List to Some" >:: (fun _ctx ->
+      assert_equal "(Some [1; 2; 3])" @@ option_of_null (`List [`Int 1;`Int 2;`Int 3])
+    );
 ]

data/tracks/ocaml/tools/test-generator/test/parser_test.ml

@@ -7,7 +7,7 @@ let ae exp got _test_ctxt = assert_equal exp got
 
 let single x = Ok (Single x)
 
-let call_parser json = parse_json_text json "expected" "cases" |> Result.map ~f:(fun c -> c.tests)
+let call_parser json = parse_json_text json "cases" |> Result.map ~f:(fun c -> c.tests)
 
 let parser_tests = [
   "gives an error with a json map that does not have the key cases in" >::
@@ -23,35 +23,35 @@ let parser_tests = [
        (call_parser "{\"cases\" : [\"key\"]}");
 
   "parses a single element with a description and expected string output" >::
-    ae (single [{description = "d1"; parameters = []; expected = `String "value"}])
+    ae (single [{description = "d1"; parameters = [("expected", `String "value")]}])
        (call_parser "{\"cases\" : [{\"description\" : \"d1\", \"expected\" : \"value\"}]}");
 
   "parses a single element with a description and expected float output" >::
-    ae (single [{description = "d1"; parameters = []; expected = `Float 100.}])
+    ae (single [{description = "d1"; parameters = [("expected", `Float 100.)]}])
        (call_parser "{\"cases\" : [{\"description\" : \"d1\", \"expected\" : 100.0}]}");
 
   "parses a single element with a description and expected bool output" >::
-    ae (single [{description = "d1"; parameters = []; expected = `Bool true}])
+    ae (single [{description = "d1"; parameters = [("expected", `Bool true)];}])
       (call_parser "{\"cases\" : [{\"description\" : \"d1\", \"expected\" : true}]}");
 
   "parses a single element with a description and expected int list output" >::
-    ae (single [{description = "d1"; parameters = []; expected = `List [`Int 1;`Int 2;`Int 3]}])
+    ae (single [{description = "d1"; parameters = [("expected", `List [`Int 1;`Int 2;`Int 3])]}])
       (call_parser "{\"cases\" : [{\"description\" : \"d1\", \"expected\" : [1, 2, 3]}]}");
 
   "parses a single element with a description and expected null output" >::
-    ae (single [{description = "d1"; parameters = []; expected = `Null}])
+    ae (single [{description = "d1"; parameters = [("expected", `Null)]}])
       (call_parser "{\"cases\" : [{\"description\" : \"d1\", \"expected\" : null}]}");
 
   "parses a single element with an int key value pair" >::
-    ae (single [{description = "d1"; parameters = [("input", `Int 1996)]; expected = `Bool true}])
+    ae (single [{description = "d1"; parameters = [("input", `Int 1996); ("expected", `Bool true)]}])
       (call_parser "{\"cases\" : [{\"description\" : \"d1\", \"input\" : 1996, \"expected\" : true}]}");
 
   "parses a single element with a string key value pair" >::
-    ae (single [{description = "d1"; parameters = [("input", `String "some-string")]; expected = `Int 85}])
+    ae (single [{description = "d1"; parameters = [("input", `String "some-string"); ("expected", `Int 85)]}])
       (call_parser "{\"cases\" : [{\"description\" : \"d1\", \"input\" : \"some-string\", \"expected\" : 85}]}");
 
   "parses a single element with a string list key value pair" >::
-    ae (single [{description = "d1"; parameters = [("input", `List [`String "s1"; `String "s2"])]; expected = `Int 85}])
+    ae (single [{description = "d1"; parameters = [("input", `List [`String "s1"; `String "s2"]); ("expected", `Int 85)]}])
       (call_parser "{\"cases\" : [{\"description\" : \"d1\", \"input\" : [\"s1\", \"s2\"], \"expected\" : 85}]}");
 
   "an element without a description is an Error" >::
@@ -67,7 +67,7 @@ let parser_tests = [
       (call_parser "{\"cases\" : [{\"input\" : 11}]}");
 
   "parses a map in the expected parameter" >::(fun _ctx ->
-      assert_equal (single [{description = "d1"; parameters = []; expected = `Assoc [("one", `Int 1); ("two", `Int 2)]}])
+      assert_equal (single [{description = "d1"; parameters = [("expected", `Assoc [("one", `Int 1); ("two", `Int 2)])]}])
         (call_parser "{\"cases\" : [{\"description\" : \"d1\", \"expected\" : {\"one\": 1, \"two\": 2}}]}");
       );
 

data/tracks/purescript/exercises/bob/test/Main.purs

@@ -14,7 +14,7 @@ main = runTest do
         Bob.hey "Tom-ay-totom-aaaah-to."
 
     test "shouting" do
-      Assert.equal "Whoachill out!" $
+      Assert.equal "Whoa, chill out!" $
         Bob.hey "WATCH OUT!"
 
     test "asking a question" do
@@ -34,11 +34,11 @@ main = runTest do
         Bob.hey "It's OK if you don't want to go to the DMV."
 
     test "forceful questions" do
-      Assert.equal "Whoachill out!" $
+      Assert.equal "Whoa, chill out!" $
         Bob.hey "WHAT THE HELL WERE YOU THINKING?"
 
     test "shouting numbers" do
-      Assert.equal "Whoachill out!" $
+      Assert.equal "Whoa, chill out!" $
         Bob.hey "12, 3 GO!"
 
     test "only numbers" do
@@ -50,11 +50,11 @@ main = runTest do
         Bob.hey "4?"
 
     test "shouting with special characters" do
-      Assert.equal "Whoachill out!" $
+      Assert.equal "Whoa, chill out!" $
         Bob.hey "ZOMG THE %^*@#$(*^ ZOMBIES ARE COMING!!11!!1!"
 
     test "shouting with no exclamation mark" do
-      Assert.equal "Whoachill out!" $
+      Assert.equal "Whoa, chill out!" $
         Bob.hey "I HATE YOU"
 
     test "statement containing a question mark" do

data/tracks/ruby/bin/generate

@@ -3,7 +3,7 @@
 require_relative '../lib/helper'
 require 'generator'
 
-paths = Generator::Paths.new(track: XRUBY_ROOT, metadata: METADATA_REPOSITORY_PATH)
+paths = Generator::Paths.new(track: EXERCISM_RUBY_ROOT, metadata: METADATA_REPOSITORY_PATH)
 
 generators = Generator::CommandLine.new(paths).parse(ARGV)
 exit 1 unless generators

data/tracks/ruby/docs/24pullrequests.md

@@ -18,4 +18,4 @@ Something missing?  Create a pull request!
 
 Check out the [Getting Involved in a Track](https://github.com/exercism/exercism.io/blob/master/docs/getting-involved-in-a-track.md) documentation, and some [ideas for things we are looking for](http://exercism.io/languages/ruby/todo) for exercises that are needed to be implemented.
 
-We are available to answer questions in the  [![Join the chat at https://gitter.im/exercism/xruby](https://badges.gitter.im/exercism/xruby.svg)](https://gitter.im/exercism/xruby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge).
+We are available to answer questions in the  [![Join the chat at https://gitter.im/exercism/ruby](https://badges.gitter.im/exercism/ruby.svg)](https://gitter.im/exercism/ruby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge).

data/tracks/ruby/exercises/all-your-base/all_your_base_test.rb

@@ -1,7 +1,7 @@
 require 'minitest/autorun'
 require_relative 'all_your_base'
 
-# Common test data version: 1.0.0 39de23b
+# Common test data version: 1.1.0 c4d8d95
 class AllYourBaseTest < Minitest::Test
   def test_single_bit_one_to_decimal
     # skip
@@ -171,10 +171,10 @@ class AllYourBaseTest < Minitest::Test
                  "Expected #{expected} but got #{converted}."
   end
 
-  def test_negative_digit
+  def test_first_base_is_one
     skip
-    digits = [1, -1, 1, 0, 1, 0]
-    input_base = 2
+    digits = []
+    input_base = 1
     output_base = 10
 
     assert_raises ArgumentError do
@@ -182,10 +182,10 @@ class AllYourBaseTest < Minitest::Test
     end
   end
 
-  def test_invalid_positive_digit
+  def test_first_base_is_zero
     skip
-    digits = [1, 2, 1, 0, 1, 0]
-    input_base = 2
+    digits = []
+    input_base = 0
     output_base = 10
 
     assert_raises ArgumentError do
@@ -193,10 +193,10 @@ class AllYourBaseTest < Minitest::Test
     end
   end
 
-  def test_first_base_is_one
+  def test_first_base_is_negative
     skip
-    digits = []
-    input_base = 1
+    digits = [1]
+    input_base = -2
     output_base = 10
 
     assert_raises ArgumentError do
@@ -204,21 +204,21 @@ class AllYourBaseTest < Minitest::Test
     end
   end
 
-  def test_second_base_is_one
+  def test_negative_digit
     skip
-    digits = [1, 0, 1, 0, 1, 0]
+    digits = [1, -1, 1, 0, 1, 0]
     input_base = 2
-    output_base = 1
+    output_base = 10
 
     assert_raises ArgumentError do
       BaseConverter.convert(input_base, digits, output_base)
     end
   end
 
-  def test_first_base_is_zero
+  def test_invalid_positive_digit
     skip
-    digits = []
-    input_base = 0
+    digits = [1, 2, 1, 0, 1, 0]
+    input_base = 2
     output_base = 10
 
     assert_raises ArgumentError do
@@ -226,22 +226,22 @@ class AllYourBaseTest < Minitest::Test
     end
   end
 
-  def test_second_base_is_zero
+  def test_second_base_is_one
     skip
-    digits = [7]
-    input_base = 10
-    output_base = 0
+    digits = [1, 0, 1, 0, 1, 0]
+    input_base = 2
+    output_base = 1
 
     assert_raises ArgumentError do
       BaseConverter.convert(input_base, digits, output_base)
     end
   end
 
-  def test_first_base_is_negative
+  def test_second_base_is_zero
     skip
-    digits = [1]
-    input_base = -2
-    output_base = 10
+    digits = [7]
+    input_base = 10
+    output_base = 0
 
     assert_raises ArgumentError do
       BaseConverter.convert(input_base, digits, output_base)

data/tracks/ruby/exercises/alphametics/.meta/generator/test_template.erb

@@ -12,7 +12,7 @@ class AlphameticsTest < Minitest::Test
   end
 <% end %>
 
-<%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
+<%= IO.read(EXERCISM_RUBY_LIB + '/bookkeeping.md') %>
 
   def test_bookkeeping
     skip

data/tracks/ruby/exercises/bowling/.meta/generator/test_template.erb

@@ -18,7 +18,7 @@ class BowlingTest < Minitest::Test
   end
 
 <% end %>
-<%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
+<%= IO.read(EXERCISM_RUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
     assert_equal <%= version %>, BookKeeping::VERSION

data/tracks/ruby/exercises/bowling/bowling_test.rb

@@ -1,7 +1,7 @@
 require 'minitest/autorun'
 require_relative 'bowling'
 
-# Common test data version: 1.0.0 3cf5eb9
+# Common test data version: 1.0.1 26e345e
 class BowlingTest < Minitest::Test
   def setup
     @game = Game.new
@@ -95,7 +95,7 @@ class BowlingTest < Minitest::Test
     assert_equal 300, @game.score
   end
 
-  def test_rolls_can_not_score_negative_points
+  def test_rolls_cannot_score_negative_points
     skip
     record([])
     assert_raises Game::BowlingError do
@@ -103,7 +103,7 @@ class BowlingTest < Minitest::Test
     end
   end
 
-  def test_a_roll_can_not_score_more_than_10_points
+  def test_a_roll_cannot_score_more_than_10_points
     skip
     record([])
     assert_raises Game::BowlingError do
@@ -111,7 +111,7 @@ class BowlingTest < Minitest::Test
     end
   end
 
-  def test_two_rolls_in_a_frame_can_not_score_more_than_10_points
+  def test_two_rolls_in_a_frame_cannot_score_more_than_10_points
     skip
     record([5])
     assert_raises Game::BowlingError do
@@ -119,7 +119,7 @@ class BowlingTest < Minitest::Test
     end
   end
 
-  def test_bonus_roll_after_a_strike_in_the_last_frame_can_not_score_more_than_10_points
+  def test_bonus_roll_after_a_strike_in_the_last_frame_cannot_score_more_than_10_points
     skip
     record([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10])
     assert_raises Game::BowlingError do
@@ -127,7 +127,7 @@ class BowlingTest < Minitest::Test
     end
   end
 
-  def test_two_bonus_rolls_after_a_strike_in_the_last_frame_can_not_score_more_than_10_points
+  def test_two_bonus_rolls_after_a_strike_in_the_last_frame_cannot_score_more_than_10_points
     skip
     record([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 5])
     assert_raises Game::BowlingError do
@@ -141,7 +141,7 @@ class BowlingTest < Minitest::Test
     assert_equal 26, @game.score
   end
 
-  def test_the_second_bonus_rolls_after_a_strike_in_the_last_frame_can_not_be_a_strike_if_the_first_one_is_not_a_strike
+  def test_the_second_bonus_rolls_after_a_strike_in_the_last_frame_cannot_be_a_strike_if_the_first_one_is_not_a_strike
     skip
     record([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 6])
     assert_raises Game::BowlingError do
@@ -149,7 +149,7 @@ class BowlingTest < Minitest::Test
     end
   end
 
-  def test_second_bonus_roll_after_a_strike_in_the_last_frame_can_not_score_than_10_points
+  def test_second_bonus_roll_after_a_strike_in_the_last_frame_cannot_score_more_than_10_points
     skip
     record([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 10])
     assert_raises Game::BowlingError do
@@ -157,7 +157,7 @@ class BowlingTest < Minitest::Test
     end
   end
 
-  def test_an_unstarted_game_can_not_be_scored
+  def test_an_unstarted_game_cannot_be_scored
     skip
     record([])
     assert_raises Game::BowlingError do
@@ -165,7 +165,7 @@ class BowlingTest < Minitest::Test
     end
   end
 
-  def test_an_incomplete_game_can_not_be_scored
+  def test_an_incomplete_game_cannot_be_scored
     skip
     record([0, 0])
     assert_raises Game::BowlingError do

data/tracks/ruby/exercises/change/.meta/.version

@@ -1 +1 @@
-1
+2

data/tracks/ruby/exercises/change/.meta/solutions/change.rb

@@ -1,5 +1,5 @@
 module BookKeeping
-  VERSION = 1
+  VERSION = 2
 end
 
 class Change

data/tracks/ruby/exercises/change/change_test.rb

@@ -1,7 +1,7 @@
 require 'minitest/autorun'
 require_relative 'change'
 
-# Common test data version: 1.0.0 3d8b5b3
+# Common test data version: 1.1.0 52cf1cf
 class ChangeTest < Minitest::Test
   def test_single_coin_change
     # skip
@@ -33,6 +33,11 @@ class ChangeTest < Minitest::Test
     assert_equal [2, 2, 2, 5, 10], Change.generate([2, 5, 10, 20, 50], 21)
   end
 
+  def test_another_possible_change_without_unit_coins_available
+    skip
+    assert_equal [4, 4, 4, 5, 5, 5], Change.generate([4, 5], 27)
+  end
+
   def test_no_coins_make_0_change
     skip
     assert_equal [], Change.generate([1, 5, 10, 21, 25], 0)
@@ -72,6 +77,6 @@ class ChangeTest < Minitest::Test
 
   def test_bookkeeping
     skip
-    assert_equal 1, BookKeeping::VERSION
+    assert_equal 2, BookKeeping::VERSION
   end
 end

data/tracks/ruby/exercises/collatz-conjecture/.meta/generator/collatz_conjecture_case.rb

@@ -4,7 +4,7 @@ class CollatzConjectureCase < Generator::ExerciseCase
 
   def workload
     case expected
-    when Fixnum
+    when Integer
       standard_assertion
     when Hash
       error_assertion

data/tracks/ruby/exercises/connect/.meta/generator/test_template.erb

@@ -10,7 +10,7 @@ class ConnectTest < Minitest::Test
   end
 
 <% end %>
-<%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
+<%= IO.read(EXERCISM_RUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
     assert_equal <%= version %>, BookKeeping::VERSION

data/tracks/ruby/exercises/dominoes/.meta/generator/test_template.erb

@@ -10,7 +10,7 @@ class DominoesTest < Minitest::Test
   end
 
 <% end %>
-<%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
+<%= IO.read(EXERCISM_RUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
     assert_equal <%= version %>, BookKeeping::VERSION

data/tracks/ruby/exercises/hamming/.meta/generator/hamming_case.rb

@@ -2,7 +2,7 @@ require 'generator/exercise_case'
 
 class HammingCase < Generator::ExerciseCase
   def workload
-    if raises_error?
+    if expects_error?
       assert_raises(ArgumentError) { test_case }
     else
       assert_equal { test_case }
@@ -14,4 +14,8 @@ class HammingCase < Generator::ExerciseCase
   def test_case
     "Hamming.compute('#{strand1}', '#{strand2}')"
   end
+
+  def expects_error?
+    expected.is_a? Hash
+  end
 end