Fix oddities and update spec

Author: nattsw

lib/discourse_translator/translator_selection_validator.rb

@@ -10,15 +10,15 @@ def valid_value?(val)
       return true if val.blank?
 
       if val == "DiscourseAi"
-        return false if !defined?(DiscourseAutomation)
+        return false if !defined?(::DiscourseAi)
         return false if !SiteSetting.ai_helper_enabled
       end
 
       true
     end
 
     def error_message
-      return I18n.t("translator.discourse_ai.not_installed") if !defined?(DiscourseAutomation)
+      return I18n.t("translator.discourse_ai.not_installed") if !defined?(::DiscourseAi)
 
       I18n.t("translator.discourse_ai.ai_helper_required") if !SiteSetting.ai_helper_enabled
     end

spec/lib/translator_selection_validator_spec.rb

@@ -3,74 +3,76 @@
 require "rails_helper"
 
 describe ::DiscourseTranslator::TranslatorSelectionValidator do
-  subject { described_class.new }
-
-  fab!(:llm_model) { Fabricate(:llm_model) }
+  fab!(:llm_model)
 
   describe "#valid_value?" do
     context "when value is blank" do
       it "returns true" do
-        expect(subject.valid_value?(nil)).to eq(true)
-        expect(subject.valid_value?("")).to eq(true)
+        expect(described_class.new.valid_value?(nil)).to eq(true)
+        expect(described_class.new.valid_value?("")).to eq(true)
       end
     end
 
     context "when value is 'DiscourseAi'" do
-      context "when DiscourseAutomation is not defined" do
+      context "when DiscourseAi is not defined" do
         it "returns false" do
-          hide_const("DiscourseAutomation")
-          expect(subject.valid_value?("DiscourseAi")).to eq(false)
+          hide_const("DiscourseAi")
+          expect(described_class.new.valid_value?("DiscourseAi")).to eq(false)
         end
       end
 
-      context "when DiscourseAutomation is defined but ai_helper_enabled is false" do
+      context "when DiscourseAi is defined but ai_helper_enabled is false" do
         it "returns false" do
           SiteSetting.ai_helper_enabled = false
-          expect(subject.valid_value?("DiscourseAi")).to eq(false)
+          expect(described_class.new.valid_value?("DiscourseAi")).to eq(false)
         end
       end
 
-      context "when DiscourseAutomation is defined and ai_helper_enabled is true" do
+      context "when DiscourseAi is defined and ai_helper_enabled is true" do
         it "returns true" do
           DiscourseAi::Completions::Llm.with_prepared_responses(["OK"]) do
             SiteSetting.ai_helper_model = "custom:#{llm_model.id}"
             SiteSetting.ai_helper_enabled = true
           end
-          expect(subject.valid_value?("DiscourseAi")).to eq(true)
+          expect(described_class.new.valid_value?("DiscourseAi")).to eq(true)
         end
       end
     end
 
     context "when value is not 'DiscourseAi'" do
       it "returns true" do
-        expect(subject.valid_value?("googly")).to eq(true)
-        expect(subject.valid_value?("poopy")).to eq(true)
+        expect(described_class.new.valid_value?("googly")).to eq(true)
+        expect(described_class.new.valid_value?("poopy")).to eq(true)
       end
     end
   end
 
   describe "#error_message" do
-    context "when DiscourseAutomation is not defined" do
+    context "when DiscourseAi is not defined" do
       it "returns the not_installed error message" do
-        hide_const("DiscourseAutomation")
-        expect(subject.error_message).to eq(I18n.t("translator.discourse_ai.not_installed"))
+        hide_const("DiscourseAi")
+        expect(described_class.new.error_message).to eq(
+          I18n.t("translator.discourse_ai.not_installed"),
+        )
       end
     end
 
-    context "when DiscourseAutomation is defined but ai_helper_enabled is false" do
+    context "when DiscourseAi is defined but ai_helper_enabled is false" do
       it "returns the ai_helper_required error message" do
         SiteSetting.ai_helper_enabled = false
-        expect(subject.error_message).to eq(I18n.t("translator.discourse_ai.ai_helper_required"))
+        expect(described_class.new.error_message).to eq(
+          I18n.t("translator.discourse_ai.ai_helper_required"),
+        )
       end
     end
 
-    context "when DiscourseAutomation is defined and ai_helper_enabled is true" do
+    context "when DiscourseAi is defined and ai_helper_enabled is true" do
       it "returns nil" do
         DiscourseAi::Completions::Llm.with_prepared_responses(["OK"]) do
           SiteSetting.ai_helper_model = "custom:#{llm_model.id}"
           SiteSetting.ai_helper_enabled = true
         end
-        expect(subject.error_message).to be_nil
+        expect(described_class.new.error_message).to be_nil
       end
     end
   end

spec/services/discourse_ai_spec.rb

@@ -3,49 +3,55 @@
 require "rails_helper"
 
 describe DiscourseTranslator::DiscourseAi do
+  fab!(:post)
+
   before do
-    SiteSetting.translator_enabled = true
     Fabricate(:fake_model).tap do |fake_llm|
       SiteSetting.public_send("ai_helper_model=", "custom:#{fake_llm.id}")
     end
+    SiteSetting.ai_helper_enabled = true
+    SiteSetting.translator_enabled = true
+    SiteSetting.translator = "DiscourseAi"
   end
 
   describe ".detect" do
-    let(:post) { Fabricate(:post) }
-
     it "stores the detected language in a custom field" do
       locale = "de"
       DiscourseAi::Completions::Llm.with_prepared_responses(["<output>de</output>"]) do
         DiscourseTranslator::DiscourseAi.detect(post)
+        post.save_custom_fields
       end
 
       expect(post.custom_fields[DiscourseTranslator::DETECTED_LANG_CUSTOM_FIELD]).to eq locale
     end
 
     it "truncates to MAX LENGTH" do
-      truncated_text = post.cooked.truncate(DiscourseTranslator::DiscourseAi::MAX_DETECT_LOCALE_TEXT_LENGTH)
-      expect_any_instance_of(::DiscourseAi::AiHelper::Assistant)
-        .to receive(:generate_and_send_prompt)
-              .with(
-                CompletionPrompt.find_by(id: CompletionPrompt::DETECT_TEXT_LOCALE),
-                truncated_text,
-                Discourse.system_user
-              ).and_call_original
+      truncated_text =
+        post.cooked.truncate(DiscourseTranslator::DiscourseAi::MAX_DETECT_LOCALE_TEXT_LENGTH)
+      expect_any_instance_of(::DiscourseAi::AiHelper::Assistant).to receive(
+        :generate_and_send_prompt,
+      ).with(
+        CompletionPrompt.find_by(id: CompletionPrompt::DETECT_TEXT_LOCALE),
+        truncated_text,
+        Discourse.system_user,
+      ).and_call_original
 
       DiscourseAi::Completions::Llm.with_prepared_responses(["<output>de</output>"]) do
         DiscourseTranslator::DiscourseAi.detect(post)
       end
     end
-
-    it "returns if settings are not correct" do
-
-    end
   end
 
   describe ".translate" do
+    before do
+      post.custom_fields[DiscourseTranslator::DETECTED_LANG_CUSTOM_FIELD] = "de"
+      post.save_custom_fields
+    end
+
     it "translates the post and returns [locale, translated_text]" do
-      post = Fabricate(:post)
-      DiscourseAi::Completions::Llm.with_prepared_responses(["<output>some translated text</output>", "<output>translated</output>"]) do
+      DiscourseAi::Completions::Llm.with_prepared_responses(
+        ["<output>some translated text</output>", "<output>translated</output>"],
+      ) do
         locale, translated_text = DiscourseTranslator::DiscourseAi.translate(post)
         expect(locale).to eq "de"
         expect(translated_text).to eq "some translated text"