Merge branch 'master' into master-legacy

berkmancenter · Sep 4, 2019 · ede087c · ede087c
2 parents 15d6a83 + 04ef5c6
commit ede087c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -205,7 +205,7 @@ GEM
       bourbon (>= 2.1)
       sass (>= 3.2)
     nested_form (0.3.2)
-    nokogiri (1.10.3)
+    nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     oink (0.10.1)
       activerecord

diff --git a/spec/integration/notice_search_spec.rb b/spec/integration/notice_search_spec.rb
@@ -284,6 +284,7 @@
       end
 
       within_search_results_for('123-45-6789') do
+        skip 'Relies on updates to elasticsearch'
         expect(page).to have_n_results(0)
       end
-Original file line number
+Diff line change
@@ Expand Up / @@ -284,6 +284,7 @@ @@
           end
           within_search_results_for('123-45-6789') do
+            skip 'Relies on updates to elasticsearch'
             expect(page).to have_n_results(0)
           end
@@ Expand Down @@