Fix some tests and add more tests for the snippet interpolation logic

Author: trinitytakei

app/models/ingredient.rb

@@ -63,11 +63,6 @@ def dependencies_satisfied?(recipe)
     requires.all? { |dep| recipe.ingredients.any? { |i| i.name == dep } }
   end
 
-  def template_with_interpolated_snippets
-    interpolate_snippets
-    template_content
-  end
-
   def configuration_for(configuration)
     # Validate configuration against configures_with schema
     configures_with.each do |key, validator|

app/views/ingredients/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_with(model: ingredient, class: "space-y-8 divide-y divide-gray-200" do |f| %>
+<%= form_with(model: ingredient, class: "space-y-8 divide-y divide-gray-200") do |f| %>
   <% if ingredient.errors.any? %>
     <div class="rounded-md bg-red-50 p-4">
       <div class="flex">

test/models/ingredient_test.rb

@@ -267,7 +267,7 @@ class IngredientTest < ActiveSupport::TestCase
     assert_equal [ "existing snippet" ], ingredient.snippets
   end
 
-  test "interpolates snippets into template content" do
+  test "Does not interpolate snippets into template content" do
     ingredient = Ingredient.new(
       name: "Test Ingredient",
       category: "Testing",
@@ -277,35 +277,68 @@ class IngredientTest < ActiveSupport::TestCase
     ingredient.new_snippets = [ '"foo"', '"bar"' ]
     ingredient.save!
 
-    expected_content = 'say "This is my template"\ncreate_file "myfile.rb", "foo"\ncreate_file "my_other_file.rb", "bar"'
+    expected_content = 'say "This is my template"\ncreate_file "myfile.rb", {{1}}\ncreate_file "my_other_file.rb", {{2}}'
     assert_equal expected_content, ingredient.template_content
   end
 
-  test "handles missing snippets gracefully" do
+  test "handles template without placeholders" do
     ingredient = Ingredient.new(
       name: "Test Ingredient",
       category: "Testing",
-      template_content: 'say "This is my template"\ncreate_file "myfile.rb", {{1}}\ncreate_file "my_other_file.rb", {{2}}',
+      template_content: 'say "This is my template"',
       created_by: users(:john)
     )
-    ingredient.new_snippets = [ '"foo"' ]  # Only one snippet provided
+    ingredient.new_snippets = [ '"foo"', '"bar"' ]
     ingredient.save!
 
-    # The second placeholder should remain unchanged
-    expected_content = 'say "This is my template"\ncreate_file "myfile.rb", "foo"\ncreate_file "my_other_file.rb", {{2}}'
-    assert_equal expected_content, ingredient.template_content
+    assert_equal 'say "This is my template"', ingredient.template_content
   end
 
-  test "handles template without placeholders" do
+  test "template_with_interpolated_snippets with no snippets returns original template" do
+    ingredient = Ingredient.new(template_content: "some template", snippets: [])
+    assert_equal "some template", ingredient.template_with_interpolated_snippets
+  end
+
+  test "template_with_interpolated_snippets interpolates single-line snippets" do
     ingredient = Ingredient.new(
-      name: "Test Ingredient",
-      category: "Testing",
-      template_content: 'say "This is my template"',
-      created_by: users(:john)
+      template_content: "First {{1}} and then {{2}}",
+      snippets: [ "hello", "world" ]
     )
-    ingredient.new_snippets = [ '"foo"', '"bar"' ]
-    ingredient.save!
+    assert_equal "First \"hello\" and then \"world\"", ingredient.template_with_interpolated_snippets
+  end
 
-    assert_equal 'say "This is my template"', ingredient.template_content
+  test "template_with_interpolated_snippets interpolates multi-line snippets" do
+    ingredient = Ingredient.new(
+      template_content: "Code:\n{{1}}\nMore code:\n{{2}}",
+      snippets: [ "def foo\n  puts 'bar'\nend", "x = 1" ]
+    )
+    expected = <<~EXPECTED
+      Code:
+      <<~SNIPPET_1
+      def foo
+        puts 'bar'
+      end
+      SNIPPET_1
+
+      More code:
+      "x = 1"
+    EXPECTED
+    assert_equal expected.chomp, ingredient.template_with_interpolated_snippets
+  end
+
+  test "template_with_interpolated_snippets preserves heredoc snippets" do
+    ingredient = Ingredient.new(
+      template_content: "Code: {{1}}",
+      snippets: [ "<<~SQL\nSELECT * FROM users\nSQL" ]
+    )
+    assert_equal "Code: <<~SQL\nSELECT * FROM users\nSQL", ingredient.template_with_interpolated_snippets
+  end
+
+  test "template_with_interpolated_snippets preserves quoted snippets" do
+    ingredient = Ingredient.new(
+      template_content: "Text: {{1}}",
+      snippets: [ "'already quoted'" ]
+    )
+    assert_equal "Text: 'already quoted'", ingredient.template_with_interpolated_snippets
   end
 end

test/services/data_repository_service_test.rb

@@ -88,7 +88,11 @@ def setup
   end
 
   test "writes ingredient to repository" do
-    ingredient = Data.define(:name, :template_content, :created_by, :id).new(
+    ingredient = Data.define(:name, :template_content, :created_by, :id) do
+      def template_with_interpolated_snippets
+        template_content
+      end
+    end.new(
       name: "test_ingredient",
       template_content: "# Test template",
       created_by: @user,
@@ -274,7 +278,11 @@ def update(head_commit_sha: nil)
   end
 
   test "raises error when writing ingredient template to local filesystem fails" do
-    ingredient = Data.define(:name, :template_content, :created_by, :id).new(
+    ingredient = Data.define(:name, :template_content, :created_by, :id) do
+      def template_with_interpolated_snippets
+        template_content
+      end
+    end.new(
       name: "test_ingredient",
       template_content: "# Test template",
       created_by: @user,

test/system/ingredients_test.rb

@@ -57,7 +57,7 @@ class IngredientsTest < ApplicationSystemTestCase
     fill_in "Description", with: "A test ingredient description"
 
     page.execute_script(<<~JS)
-      document.querySelector('.CodeMirror').CodeMirror.setValue("gem 'test_gem'")
+      document.querySelector('textarea[name="ingredient[template_content]"] + div[class*="CodeMirror"]').CodeMirror.setValue("gem 'test_gem'")
     JS
 
     fill_in "Category", with: "Authentication"