From 650047ee5f954ef5488b54ff1ddb5d651e5b5e24 Mon Sep 17 00:00:00 2001 From: Austin Ziegler Date: Mon, 15 Nov 2021 13:41:25 -0500 Subject: [PATCH] Standardrb fixup --- test/test_mime_types_class.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/test/test_mime_types_class.rb b/test/test_mime_types_class.rb index fa689ec..f219cb5 100644 --- a/test/test_mime_types_class.rb +++ b/test/test_mime_types_class.rb @@ -101,15 +101,13 @@ def setup assert_includes MIME::Types.type_for("xtxt"), "text/plain" end -<<<<<<< HEAD it "handles newline characters correctly" do assert_includes MIME::Types.type_for("test.pdf\n.txt"), "text/plain" assert_includes MIME::Types.type_for("test.txt\n.pdf"), "application/pdf" -||||||| parent of 32714bc5f1ae (Add a stable sort) -======= - it 'returns a stable order for types with equal priority' do - assert_equal %w(audio/webm video/webm), MIME::Types.type_for('foo.webm') ->>>>>>> 32714bc5f1ae (Add a stable sort) + end + + it "returns a stable order for types with equal priority" do + assert_equal %w[audio/webm video/webm], MIME::Types.type_for("foo.webm") end end