Test files are compatible with TestBench 2.0

ntl · ntl · commit f200b98cbf41 · 2019-10-14T14:57:45.000-05:00
diff --git a/test/automated.rb b/test/automated.rb
@@ -1,6 +1,5 @@
-require_relative 'test_init'
+ENV['TEST_BENCH_EXCLUDE_FILE_PATTERN'] ||= '/_|sketch|(_init\.rb|_tests\.rb)\z'
 
-TestBench::Runner.(
-  'automated/**/*.rb',
-  exclude_pattern: %r{\/_|sketch|(_init\.rb|_tests\.rb)\z}
-) or exit 1
+require_relative './test_init'
+
+TestBench::CLI.()
diff --git a/test/automated/write/batch/write_initial.rb b/test/automated/write/batch/write_initial.rb
@@ -33,8 +33,8 @@
       Write.(message, stream_name)
 
       test "Is an error" do
-        assert proc { write.initial(batch, stream_name) } do
-          raises_error? MessageStore::ExpectedVersion::Error
+        assert_raises MessageStore::ExpectedVersion::Error do
+          write.initial(batch, stream_name)
         end
       end
     end
diff --git a/test/automated/write/expected_version.rb b/test/automated/write/expected_version.rb
@@ -18,8 +18,8 @@
 
     context "Wrong Version" do
       test "Fails" do
-        assert proc { Write.(message_2, stream_name, expected_version: 11) } do
-          raises_error? MessageStore::ExpectedVersion::Error
+        assert_raises MessageStore::ExpectedVersion::Error do
+          Write.(message_2, stream_name, expected_version: 11)
         end
       end
     end
diff --git a/test/automated/write/message/reply_missing_reply_stream_name_error.rb b/test/automated/write/message/reply_missing_reply_stream_name_error.rb
@@ -11,8 +11,8 @@
       write = Write.build
 
       test "Is an error" do
-        assert proc { write.reply(message) } do
-          raises_error? Messaging::Write::Error
+        assert_raises Messaging::Write::Error do
+          write.reply(message)
         end
       end
     end
diff --git a/test/automated/write/message/write_initial.rb b/test/automated/write/message/write_initial.rb
@@ -28,8 +28,8 @@
       write.(message, stream_name)
 
       test "Is an error" do
-        assert proc { write.initial(message, stream_name) } do
-          raises_error? MessageStore::ExpectedVersion::Error
+        assert_raises MessageStore::ExpectedVersion::Error do
+          write.initial(message, stream_name)
         end
       end
     end
