From 0120f44fd664826ed47a84959a196931e84540d7 Mon Sep 17 00:00:00 2001 From: Samantaz Fox Date: Tue, 11 Jan 2022 18:27:56 +0100 Subject: [PATCH] i18n: use spectator for i18next plurals spec --- shard.lock | 2 +- shard.yml | 3 ++- spec/i18next_plurals_spec.cr | 24 +++++++++++++++--------- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/shard.lock b/shard.lock index 0ef102818..ab9d97f7c 100644 --- a/shard.lock +++ b/shard.lock @@ -42,7 +42,7 @@ shards: spectator: git: https://github.com/icy-arctic-fox/spectator.git - version: 0.10.3 + version: 0.10.4 sqlite3: git: https://github.com/crystal-lang/crystal-sqlite3.git diff --git a/shard.yml b/shard.yml index 25d9e7de9..fdb27c0f5 100644 --- a/shard.yml +++ b/shard.yml @@ -28,10 +28,11 @@ dependencies: athena-negotiation: github: athena-framework/negotiation version: ~> 0.1.1 + development_dependencies: spectator: github: icy-arctic-fox/spectator - version: ~> 0.10.3 + version: ~> 0.10.4 crystal: ">= 1.0.0, < 2.0.0" diff --git a/spec/i18next_plurals_spec.cr b/spec/i18next_plurals_spec.cr index ec14f4181..ee9ff3943 100644 --- a/spec/i18next_plurals_spec.cr +++ b/spec/i18next_plurals_spec.cr @@ -1,7 +1,14 @@ -require "spec" +require "spectator" require "../src/invidious/helpers/i18next.cr" -resolver = I18next::Plurals::RESOLVER +Spectator.configure do |config| + config.fail_blank + config.randomize +end + +def resolver + I18next::Plurals::RESOLVER +end FORM_TESTS = { "ach" => I18next::Plurals::PluralForms::Single_gt_one, @@ -30,7 +37,6 @@ FORM_TESTS = { "su" => I18next::Plurals::PluralForms::None, "sk" => I18next::Plurals::PluralForms::Special_Czech_Slovak, "sl" => I18next::Plurals::PluralForms::Special_Slovenian, - } SUFFIX_TESTS = { @@ -187,20 +193,20 @@ SUFFIX_TESTS = { ], } -describe "i18next_Plural_Resolver" do +Spectator.describe "i18next_Plural_Resolver" do describe "get_plural_form" do - FORM_TESTS.each do |locale, form| + sample FORM_TESTS do |locale, form| it "returns the right plural form for locale '#{locale}'" do - resolver.get_plural_form(locale).should eq(form) + expect(resolver.get_plural_form(locale)).to eq(form) end end end describe "get_suffix" do - SUFFIX_TESTS.each do |locale, data| + sample SUFFIX_TESTS do |locale, tests| it "returns the right suffix for locale '#{locale}'" do - data.each do |d| - resolver.get_suffix(locale, d[:num]).should eq(d[:suffix]) + tests.each do |d| + expect(resolver.get_suffix(locale, d[:num])).to eq(d[:suffix]) end end end