Commit f319b555 authored by Nick Thomas's avatar Nick Thomas

Fix a number of specs to take account of the new :elastic rspec filter

parent 90760c1d
require 'spec_helper' require 'spec_helper'
describe Issue, elastic: true do describe Issue, :elastic do
before do before do
stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true) stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
Gitlab::Elastic::Helper.create_empty_index
end
after do
Gitlab::Elastic::Helper.delete_index
stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
end end
let(:project) { create :project } let(:project) { create :project }
......
require 'spec_helper' require 'spec_helper'
describe MergeRequest, elastic: true do describe MergeRequest, :elastic do
before do before do
stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true) stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
Gitlab::Elastic::Helper.create_empty_index
end
after do
Gitlab::Elastic::Helper.delete_index
stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
end end
it "searches merge requests" do it "searches merge requests" do
......
require 'spec_helper' require 'spec_helper'
describe Milestone, elastic: true do describe Milestone, :elastic do
before do before do
stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true) stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
Gitlab::Elastic::Helper.create_empty_index
end
after do
Gitlab::Elastic::Helper.delete_index
stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
end end
it "searches milestones" do it "searches milestones" do
......
require 'spec_helper' require 'spec_helper'
describe Note, elastic: true do describe Note, :elastic do
before do before do
stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true) stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
Gitlab::Elastic::Helper.create_empty_index
end
after do
Gitlab::Elastic::Helper.delete_index
stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
end end
it "searches notes" do it "searches notes" do
......
require 'spec_helper' require 'spec_helper'
describe Project, elastic: true do describe Project, :elastic do
before do before do
stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true) stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
Gitlab::Elastic::Helper.create_empty_index
end
after do
Gitlab::Elastic::Helper.delete_index
stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
end end
it "finds projects" do it "finds projects" do
......
require 'spec_helper' require 'spec_helper'
describe ProjectWiki, elastic: true do describe ProjectWiki, :elastic do
before do before do
stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true) stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
Gitlab::Elastic::Helper.create_empty_index
end
after do
Gitlab::Elastic::Helper.delete_index
stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
end end
it "searches wiki page" do it "searches wiki page" do
......
require 'spec_helper' require 'spec_helper'
describe Repository, elastic: true do describe Repository, :elastic do
before do before do
stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true) stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
Gitlab::Elastic::Helper.create_empty_index
end
after do
Gitlab::Elastic::Helper.delete_index
stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
end end
def index!(project) def index!(project)
......
require 'spec_helper' require 'spec_helper'
describe Snippet, elastic: true do describe Snippet, :elastic do
before do before do
stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true) stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
Gitlab::Elastic::Helper.create_empty_index
end
after do
Gitlab::Elastic::Helper.delete_index
stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
end end
context 'searching snippets by code' do context 'searching snippets by code' do
......
...@@ -30,12 +30,6 @@ describe Repository do ...@@ -30,12 +30,6 @@ describe Repository do
describe "Elastic search", :elastic do describe "Elastic search", :elastic do
before do before do
stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true) stub_ee_application_setting(elasticsearch_search: true, elasticsearch_indexing: true)
Gitlab::Elastic::Helper.create_empty_index
end
after do
Gitlab::Elastic::Helper.delete_index
stub_ee_application_setting(elasticsearch_search: false, elasticsearch_indexing: false)
end end
describe "class method find_commits_by_message_with_elastic" do describe "class method find_commits_by_message_with_elastic" do
......
require 'spec_helper' require 'spec_helper'
describe ElasticIndexerWorker, elastic: true do describe ElasticIndexerWorker, :elastic do
subject { described_class.new } subject { described_class.new }
before do before do
...@@ -8,12 +8,6 @@ describe ElasticIndexerWorker, elastic: true do ...@@ -8,12 +8,6 @@ describe ElasticIndexerWorker, elastic: true do
Elasticsearch::Model.client = Elasticsearch::Model.client =
Gitlab::Elastic::Client.build(Gitlab::CurrentSettings.elasticsearch_config) Gitlab::Elastic::Client.build(Gitlab::CurrentSettings.elasticsearch_config)
Gitlab::Elastic::Helper.create_empty_index
end
after do
Gitlab::Elastic::Helper.delete_index
end end
it 'returns true if ES disabled' do it 'returns true if ES disabled' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment