Merge pull request #2671 from bgeuken/sphinx

[dist] Update thinking sphinx to version 3.3.0
openSUSE · Feb 13, 2017 · 0f9b294 · 0f9b294
2 parents 1133922 + 3b0dfd0
commit 0f9b294
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/api/Gemfile.lock b/src/api/Gemfile.lock
@@ -50,7 +50,7 @@ GEM
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
     ansi (1.5.0)
-    arel (7.1.1)
+    arel (7.1.4)
     ast (2.3.0)
     builder (3.2.3)
     capybara (2.12.0)
@@ -128,7 +128,7 @@ GEM
     hoptoad_notifier (2.4.11)
       activesupport
       builder
-    i18n (0.7.0)
+    i18n (0.8.0)
     innertube (1.1.0)
     joiner (0.3.4)
       activerecord (>= 4.1.0)
@@ -239,7 +239,7 @@ GEM
     redcarpet (3.3.4)
     responders (2.2.0)
       railties (>= 4.2.0, < 5.1)
-    riddle (1.5.12)
+    riddle (2.1.0)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -306,13 +306,13 @@ GEM
       tins (~> 1.0)
     test-unit (3.2.3)
       power_assert
-    thinking-sphinx (3.2.0)
+    thinking-sphinx (3.3.0)
       activerecord (>= 3.1.0)
       builder (>= 2.1.2)
       innertube (>= 1.0.2)
       joiner (>= 0.2.0)
       middleware (>= 0.1.0)
-      riddle (>= 1.5.11)
+      riddle (>= 2.0.0)
     thor (0.19.4)
     thread_safe (0.3.5)
     tilt (2.0.5)

diff --git a/src/api/lib/obsapi/test_sphinx.rb b/src/api/lib/obsapi/test_sphinx.rb
@@ -11,6 +11,7 @@ def self.ensure
         Rails.logger.debug "Indexing and starting Sphinx"
         # Ensure sphinx directories exist for the test environment
         ThinkingSphinx::Test.init
+        ThinkingSphinx::Test.start
         # Index
         ThinkingSphinx::Test.index
         # Configure and start Sphinx