Skip to content

Commit

Permalink
Let ES start and stop itself
Browse files Browse the repository at this point in the history
  • Loading branch information
toastercup committed Nov 18, 2016
1 parent 65f9583 commit 610c96f
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 14 deletions.
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
12 changes: 0 additions & 12 deletions spec/rails_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 610c96f

Please sign in to comment.