Merge branch 'master' into glitch-soc/merge-upstream

2019-08-05 13:13:28 +02:00
parent ff0ceb28b3 6201bfdfba
commit e50554391a
52 changed files with 247 additions and 193 deletions
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -136,8 +136,8 @@ RSpec.describe Tag, type: :model do
    end

    it 'finds the exact matching tag as the first item' do
-      similar_tag = Fabricate(:tag, name: "matchlater")
-      tag = Fabricate(:tag, name: "match")
+      similar_tag = Fabricate(:tag, name: "matchlater", score: 1)
+      tag = Fabricate(:tag, name: "match", score: 1)

      results = Tag.search_for("match")