Skip to content

Commit 9c80791

Browse files
brunoocasalibrunoocasali
committed
Replace all occurrences of globals in the test code
#233
1 parent b80aa27 commit 9c80791

22 files changed

+57
-57
lines changed

‎spec/meilisearch/client/dumps_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
RSpec.describe 'MeiliSearch::Client - Dumps' do
44
before(:all) do
5-
@client = MeiliSearch::Client.new($URL, $MASTER_KEY)
5+
@client = MeiliSearch::Client.new(URL, MASTER_KEY)
66
clear_all_indexes(@client)
77
end
88

‎spec/meilisearch/client/health_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22

33
RSpec.describe 'MeiliSearch::Client - Health' do
4-
let(:client) { MeiliSearch::Client.new($URL, $MASTER_KEY) }
4+
let(:client) { MeiliSearch::Client.new(URL, MASTER_KEY) }
55
let(:wrong_client) { MeiliSearch::Client.new('bad_url') }
66

77
it 'is healthy when the url is valid' do

‎spec/meilisearch/client/indexes_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
RSpec.describe 'MeiliSearch::Client - Indexes' do
44
before(:all) do
5-
@client = MeiliSearch::Client.new($URL, $MASTER_KEY)
5+
@client = MeiliSearch::Client.new(URL, MASTER_KEY)
66
clear_all_indexes(@client)
77
@uid1 = 'uid1'
88
@uid2 = 'uid2'

‎spec/meilisearch/client/keys_spec.rb‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
RSpec.describe 'MeiliSearch::Client - Keys' do
44
before(:all) do
5-
@client = MeiliSearch::Client.new($URL, $MASTER_KEY)
5+
@client = MeiliSearch::Client.new(URL, MASTER_KEY)
66
@uid = 'uid'
77
@client.create_index(@uid)
88
end
@@ -20,37 +20,37 @@
2020

2121
it 'fails to get settings if public key used' do
2222
public_key = @client.keys['public']
23-
new_client = MeiliSearch::Client.new($URL, public_key)
23+
new_client = MeiliSearch::Client.new(URL, public_key)
2424
expect do
2525
new_client.index(@uid).settings
2626
end.to raise_meilisearch_api_error_with(403, 'invalid_token', 'authentication_error')
2727
end
2828

2929
it 'fails to get keys if private key used' do
3030
private_key = @client.keys['private']
31-
new_client = MeiliSearch::Client.new($URL, private_key)
31+
new_client = MeiliSearch::Client.new(URL, private_key)
3232
expect do
3333
new_client.keys
3434
end.to raise_meilisearch_api_error_with(403, 'invalid_token', 'authentication_error')
3535
end
3636

3737
it 'fails to search if no key used' do
38-
new_client = MeiliSearch::Client.new($URL)
38+
new_client = MeiliSearch::Client.new(URL)
3939
expect do
4040
new_client.index(@uid).settings
4141
end.to raise_meilisearch_api_error_with(401, 'missing_authorization_header', 'authentication_error')
4242
end
4343

4444
it 'succeeds to search when using public key' do
4545
public_key = @client.keys['public']
46-
new_client = MeiliSearch::Client.new($URL, public_key)
46+
new_client = MeiliSearch::Client.new(URL, public_key)
4747
response = new_client.index(@uid).search('test')
4848
expect(response).to have_key('hits')
4949
end
5050

5151
it 'succeeds to get settings when using private key' do
5252
private_key = @client.keys['private']
53-
new_client = MeiliSearch::Client.new($URL, private_key)
53+
new_client = MeiliSearch::Client.new(URL, private_key)
5454
response = new_client.index(@uid).settings
5555
expect(response).to have_key('rankingRules')
5656
end

‎spec/meilisearch/client/stats_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
RSpec.describe 'MeiliSearch::Client - Stats' do
44
before(:all) do
5-
@client = MeiliSearch::Client.new($URL, $MASTER_KEY)
5+
@client = MeiliSearch::Client.new(URL, MASTER_KEY)
66
end
77

88
it 'gets version' do

‎spec/meilisearch/index/base_spec.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@uid1 = 'UID_1'
66
@uid2 = 'UID_2'
77
@primary_key = 'objectId'
8-
client = MeiliSearch::Client.new($URL, $MASTER_KEY)
8+
client = MeiliSearch::Client.new(URL, MASTER_KEY)
99
clear_all_indexes(client)
1010
@index1 = client.create_index(@uid1)
1111
@index2 = client.create_index(@uid2, primaryKey: @primary_key)
@@ -54,14 +54,14 @@
5454

5555
it 'supports options' do
5656
options = { timeout: 2, max_retries: 1 }
57-
client = MeiliSearch::Client.new($URL, $MASTER_KEY, options)
57+
client = MeiliSearch::Client.new(URL, MASTER_KEY, options)
5858
index_uid = 'options'
5959
index = client.create_index(index_uid)
6060
expect(index.options).to eq({ timeout: 2, max_retries: 1 })
6161
expect(MeiliSearch::Index).to receive(:get).with(
62-
"#{$URL}/indexes/#{index_uid}",
62+
"#{URL}/indexes/#{index_uid}",
6363
{
64-
headers: { 'Content-Type' => 'application/json', 'X-Meili-API-Key' => $MASTER_KEY },
64+
headers: { 'Content-Type' => 'application/json', 'X-Meili-API-Key' => MASTER_KEY },
6565
body: 'null',
6666
query: {},
6767
max_retries: 1,

‎spec/meilisearch/index/documents_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
RSpec.describe 'MeiliSearch::Index - Documents' do
44
before(:all) do
5-
@client = MeiliSearch::Client.new($URL, $MASTER_KEY)
5+
@client = MeiliSearch::Client.new(URL, MASTER_KEY)
66
clear_all_indexes(@client)
77
end
88

‎spec/meilisearch/index/search/attributes_to_crop_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
title: 'The Hitchhiker\'s Guide to the Galaxy',
88
description: 'The Hitchhiker\'s Guide to the Galaxy is a comedy science fiction series by Douglas Adams.'
99
}
10-
client = MeiliSearch::Client.new($URL, $MASTER_KEY)
10+
client = MeiliSearch::Client.new(URL, MASTER_KEY)
1111
clear_all_indexes(client)
1212
@index = client.create_index('books')
1313
response = @index.add_documents(@document)

‎spec/meilisearch/index/search/attributes_to_highlight.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
{ objectId: 4, title: 'Harry Potter and the Half-Blood Prince', genre: 'fantasy' },
1212
{ objectId: 42, title: 'The Hitchhiker\'s Guide to the Galaxy' }
1313
]
14-
client = MeiliSearch::Client.new($URL, $MASTER_KEY)
14+
client = MeiliSearch::Client.new(URL, MASTER_KEY)
1515
clear_all_indexes(client)
1616
@index = client.create_index('books')
1717
response = @index.add_documents(@documents)
@@ -25,7 +25,7 @@
2525
it 'does a custom search with highlight' do
2626
response = @index.search('the', attributesToHighlight: ['title'])
2727
expect(response).to be_a(Hash)
28-
expect(response.keys).to contain_exactly(*$DEFAULT_SEARCH_RESPONSE_KEYS)
28+
expect(response.keys).to contain_exactly(*DEFAULT_SEARCH_RESPONSE_KEYS)
2929
expect(response['hits'].count).to eq(3)
3030
expect(response['hits'].first).to have_key('_formatted')
3131
expect(response['hits'].first['_formatted']['title']).to eq('<em>The</em> Hobbit')
@@ -34,15 +34,15 @@
3434
it 'does a placeholder search with attributes to highlight' do
3535
response = @index.search('', attributesToHighlight: ['*'])
3636
expect(response).to be_a(Hash)
37-
expect(response.keys).to contain_exactly(*$DEFAULT_SEARCH_RESPONSE_KEYS)
37+
expect(response.keys).to contain_exactly(*DEFAULT_SEARCH_RESPONSE_KEYS)
3838
expect(response['hits'].count).to eq(7)
3939
expect(response['hits'].first).to have_key('_formatted')
4040
end
4141

4242
it 'does a placeholder search (nil) with attributes to highlight' do
4343
response = @index.search(nil, attributesToHighlight: ['*'])
4444
expect(response).to be_a(Hash)
45-
expect(response.keys).to contain_exactly(*$DEFAULT_SEARCH_RESPONSE_KEYS)
45+
expect(response.keys).to contain_exactly(*DEFAULT_SEARCH_RESPONSE_KEYS)
4646
expect(response['hits'].count).to eq(@documents.count)
4747
expect(response['hits'].first).to have_key('_formatted')
4848
end

‎spec/meilisearch/index/search/attributes_to_retrieve_spec.rb‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
{ objectId: 4, title: 'Harry Potter and the Half-Blood Prince', genre: 'fantasy' },
1212
{ objectId: 42, title: 'The Hitchhiker\'s Guide to the Galaxy' }
1313
]
14-
client = MeiliSearch::Client.new($URL, $MASTER_KEY)
14+
client = MeiliSearch::Client.new(URL, MASTER_KEY)
1515
clear_all_indexes(client)
1616
@index = client.create_index('books')
1717
response = @index.add_documents(@documents)
@@ -25,7 +25,7 @@
2525
it 'does a custom search with one attributesToRetrieve' do
2626
response = @index.search('the', attributesToRetrieve: ['title'])
2727
expect(response).to be_a(Hash)
28-
expect(response.keys).to contain_exactly(*$DEFAULT_SEARCH_RESPONSE_KEYS)
28+
expect(response.keys).to contain_exactly(*DEFAULT_SEARCH_RESPONSE_KEYS)
2929
expect(response['hits'].count).to eq(3)
3030
expect(response['hits'].first).to have_key('title')
3131
expect(response['hits'].first).not_to have_key('objectId')
@@ -35,7 +35,7 @@
3535
it 'does a custom search with multiple attributesToRetrieve' do
3636
response = @index.search('the', attributesToRetrieve: ['title', 'genre'])
3737
expect(response).to be_a(Hash)
38-
expect(response.keys).to contain_exactly(*$DEFAULT_SEARCH_RESPONSE_KEYS)
38+
expect(response.keys).to contain_exactly(*DEFAULT_SEARCH_RESPONSE_KEYS)
3939
expect(response['hits'].count).to eq(3)
4040
expect(response['hits'].first).to have_key('title')
4141
expect(response['hits'].first).not_to have_key('objectId')
@@ -45,7 +45,7 @@
4545
it 'does a custom search with all attributesToRetrieve' do
4646
response = @index.search('the', attributesToRetrieve: ['*'])
4747
expect(response).to be_a(Hash)
48-
expect(response.keys).to contain_exactly(*$DEFAULT_SEARCH_RESPONSE_KEYS)
48+
expect(response.keys).to contain_exactly(*DEFAULT_SEARCH_RESPONSE_KEYS)
4949
expect(response['hits'].count).to eq(3)
5050
expect(response['hits'].first).to have_key('objectId')
5151
expect(response['hits'].first).to have_key('title')
@@ -55,7 +55,7 @@
5555
it 'does a placeholder search with one attributesToRetrieve' do
5656
response = @index.search('', attributesToRetrieve: ['title'])
5757
expect(response).to be_a(Hash)
58-
expect(response.keys).to contain_exactly(*$DEFAULT_SEARCH_RESPONSE_KEYS)
58+
expect(response.keys).to contain_exactly(*DEFAULT_SEARCH_RESPONSE_KEYS)
5959
expect(response['hits'].count).to eq(@documents.count)
6060
expect(response['hits'].first).to have_key('title')
6161
expect(response['hits'].first).not_to have_key('objectId')
@@ -65,7 +65,7 @@
6565
it 'does a placeholder search with multiple attributesToRetrieve' do
6666
response = @index.search('', attributesToRetrieve: ['title', 'genre'])
6767
expect(response).to be_a(Hash)
68-
expect(response.keys).to contain_exactly(*$DEFAULT_SEARCH_RESPONSE_KEYS)
68+
expect(response.keys).to contain_exactly(*DEFAULT_SEARCH_RESPONSE_KEYS)
6969
expect(response['hits'].count).to eq(@documents.count)
7070
expect(response['hits'].first).to have_key('title')
7171
expect(response['hits'].first).not_to have_key('objectId')
@@ -75,7 +75,7 @@
7575
it 'does a placeholder search with all attributesToRetrieve' do
7676
response = @index.search('', attributesToRetrieve: ['*'])
7777
expect(response).to be_a(Hash)
78-
expect(response.keys).to contain_exactly(*$DEFAULT_SEARCH_RESPONSE_KEYS)
78+
expect(response.keys).to contain_exactly(*DEFAULT_SEARCH_RESPONSE_KEYS)
7979
expect(response['hits'].count).to eq(@documents.count)
8080
expect(response['hits'].first).to have_key('title')
8181
expect(response['hits'].first).to have_key('objectId')

0 commit comments

Comments
 (0)