From 76d0bc6e26eeefa3d7fe8cc3f12c86fb03d7695c Mon Sep 17 00:00:00 2001
From: Dylan Thacker-Smith <Dylan.Smith@shopify.com>
Date: Mon, 16 Mar 2020 11:29:30 -0400
Subject: [PATCH 1/2] Remove broken conflict benchmarks

---
 performance/cache_runner.rb | 42 -------------------------------------
 1 file changed, 42 deletions(-)

diff --git a/performance/cache_runner.rb b/performance/cache_runner.rb
index 1907ae8e..24f171b8 100644
--- a/performance/cache_runner.rb
+++ b/performance/cache_runner.rb
@@ -107,28 +107,6 @@ def prepare
   end
 end
 
-module ConflictRunner
-  def prepare
-    super
-    records = (1..@count).map { |id| ::Item.find(id) }
-    orig_resolve_cache_miss = ::Item.method(:resolve_cache_miss)
-
-    ::Item.define_singleton_method(:resolve_cache_miss) do |id|
-      records[id - 1].expire_cache
-      orig_resolve_cache_miss.call(id)
-    end
-    IdentityCache.cache.clear
-  end
-end
-
-module DeletedConflictRunner
-  include ConflictRunner
-  def prepare
-    super
-    (1..@count).each { |i| ::Item.find(i).expire_cache }
-  end
-end
-
 class EmbedRunner < CacheRunner
   def setup_models
     super
@@ -161,16 +139,6 @@ class FetchEmbedDeletedRunner < EmbedRunner
 end
 CACHE_RUNNERS << FetchEmbedDeletedRunner
 
-class FetchEmbedConflictRunner < EmbedRunner
-  include ConflictRunner
-end
-CACHE_RUNNERS << FetchEmbedConflictRunner
-
-class FetchEmbedDeletedConflictRunner < EmbedRunner
-  include DeletedConflictRunner
-end
-CACHE_RUNNERS << FetchEmbedDeletedConflictRunner
-
 class NormalizedRunner < CacheRunner
   def setup_models
     super
@@ -204,13 +172,3 @@ class FetchNormalizedDeletedRunner < NormalizedRunner
   include DeletedRunner
 end
 CACHE_RUNNERS << FetchNormalizedDeletedRunner
-
-class FetchNormalizedConflictRunner < EmbedRunner
-  include ConflictRunner
-end
-CACHE_RUNNERS << FetchNormalizedConflictRunner
-
-class FetchNormalizedDeletedConflictRunner < EmbedRunner
-  include DeletedConflictRunner
-end
-CACHE_RUNNERS << FetchNormalizedDeletedConflictRunner

From bb5a7363ed3504e65f12e0c1530992fdacd651c9 Mon Sep 17 00:00:00 2001
From: Dylan Thacker-Smith <Dylan.Smith@shopify.com>
Date: Mon, 16 Mar 2020 11:50:04 -0400
Subject: [PATCH 2/2] Remove duplicate travis CI jobs exclude

---
 .travis.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 62aff922..e0821205 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,10 +36,5 @@ script:
 
 cache: bundler
 
-matrix:
-  exclude:
-    - rvm: 2.2.6
-      gemfile: gemfiles/Gemfile.rails-edge
-
 notifications:
   email: false