From 610c96fbe5ea924f07b6442d8f8d29ef7ed6bc49 Mon Sep 17 00:00:00 2001
From: Alex Tharp <toastercup@gmail.com>
Date: Thu, 17 Nov 2016 20:06:16 -0600
Subject: [PATCH] Let ES start and stop itself

---
 LICENSE.md           |  2 +-
 bower.json           |  2 +-
 spec/rails_helper.rb | 12 ------------
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/LICENSE.md b/LICENSE.md
index cc7027cf5..ad100c21c 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2015 CareerBuilder, LLC
+   Copyright 2017 CareerBuilder, LLC
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/bower.json b/bower.json
index 0c28d8fa8..455c8beda 100644
--- a/bower.json
+++ b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "cortex",
   "authors": [
-    "Content Enablement <ContentEnablementProductTeam@careerbuilder.com>"
+    "Content Enablement <EmployerSiteContentProducts@cb.com>"
   ],
   "description": "An identity, content distribution/management and reporting platform powered by Grape",
   "ignore": [
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index cd67630a2..bddcbb12b 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -8,7 +8,6 @@
 require 'api_v1_helper'
 
 require 'mocha/api'
-require 'elasticsearch/extensions/test/cluster'
 require 'net/http'
 require 'email_spec'
 require 'capybara/rspec'
@@ -56,8 +55,6 @@
   # arbitrary gems may also be filtered via:
   # config.filter_gems_from_backtrace("gem name")
 
-  elasticsearch_status = false
-
   config.include Warden::Test::Helpers
   config.include FactoryGirl::Syntax::Methods
 
@@ -72,7 +69,6 @@
     DatabaseCleaner.strategy = :transaction
     Capybara.current_driver = Capybara.javascript_driver
     DatabaseCleaner.clean_with(:truncation)
-    elasticsearch_status = test_elasticsearch
   end
 
   config.before(:each) do
@@ -87,14 +83,6 @@
   config.infer_base_class_for_anonymous_controllers = false
   config.order = 'random'
 
-  config.before :each, elasticsearch: true do
-    Elasticsearch::Extensions::Test::Cluster.start(port: 9200) unless Elasticsearch::Extensions::Test::Cluster.running?(on: 9200) || elasticsearch_status
-  end
-
-  config.after :suite do
-    Elasticsearch::Extensions::Test::Cluster.stop(port: 9200) if Elasticsearch::Extensions::Test::Cluster.running? on: 9200 || elasticsearch_status
-  end
-
   RSpec::Sidekiq.configure do |config|
     config.warn_when_jobs_not_processed_by_sidekiq = false
   end