Elasticsearch: Fixed test

Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>

Elasticsearch: Fixed test
Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>
Macartur Sousa
1 parent 2aa4656e
Showing 14 changed files with 22 additions and 30 deletions Show diff stats
plugins/elasticsearch/helpers/elasticsearch_helper.rb
plugins/elasticsearch/helpers/searchable_model/elasticsearch_indexed_model.rb
plugins/elasticsearch/lib/elasticsearch_plugin/api.rb
plugins/elasticsearch/test/test_helper.rb
plugins/elasticsearch/test/unit/api/elasticsearch_plugin_api_test.rb
plugins/elasticsearch/test/unit/api/elasticsearch_plugin_entities_test.rb
plugins/elasticsearch/test/unit/controllers/elasticsearch_plugin_controller_test.rb
plugins/elasticsearch/test/unit/helpers/elasticsearch_helper_test.rb
plugins/elasticsearch/test/unit/models/community_test.rb
plugins/elasticsearch/test/unit/models/event_test.rb
plugins/elasticsearch/test/unit/models/person_test.rb
plugins/elasticsearch/test/unit/models/text_article_test.rb
plugins/elasticsearch/test/unit/models/uploaded_file_test.rb
plugins/elasticsearch/views/elasticsearch_plugin/search.html.erb
@@ -71,7 +71,6 @@ module ElasticsearchHelper
   def query_string expression="", models=[]
     return { match_all: {}  } if not expression
-
     {
       query_string: {
         query: "*"+expression.downcase.split.join('* *')+"*",
@@ -66,6 +66,7 @@ module ElasticsearchIndexedModel
     def indexed_fields
       fields = {
+                :id           => {type: :integer },
                 :environment  => {type: :nested, hash: NestedEnvironment::environment_hash },
                 :category_ids => {type: :integer },
                 :created_at   => {type: :date }
@@ -83,7 +84,6 @@ module ElasticsearchIndexedModel
         self.class.indexed_fields.each do |field, value|
           type = value[:type].presence
-
           if type == :nested
             attrs[field] = {}
             value[:hash].each do |hash_field, hash_value|
@@ -10,7 +10,7 @@ class ElasticsearchPlugin::API &lt; Grape::API
       target = process_results
       present target,
               :with => Elasticsearch::Entities::Result,
-              :types => ElasticsearchHelper.searchable_types.except(:all).keys.map { |key| key.to_s.classify }
+              :types => searchable_types.except(:all).keys.map { |key| key.to_s.classify }
     end
     get 'types' do
@@ -20,7 +20,7 @@ module ElasticsearchTestHelper
       model.__elasticsearch__.create_index! force: true
       model.import
     }
-    sleep 2
+    sleep 3
   end
   def setup_environment
 require "#{File.dirname(__FILE__)}/../../test_helper"
+require_relative '../../../helpers/elasticsearch_helper'
 class ElasticsearchPluginApiTest < ActiveSupport::TestCase
   include ElasticsearchTestHelper
+  include ElasticsearchHelper
   def indexed_models
     [Community, Person]
@@ -17,7 +19,7 @@ class ElasticsearchPluginApiTest &lt; ActiveSupport::TestCase
     get "/api/v1/search/types"
     json = JSON.parse(last_response.body)
     assert_equal 200, last_response.status
-    assert_equal ElasticsearchHelper::searchable_types.stringify_keys.keys, json["types"]
+    assert_equal searchable_types.stringify_keys.keys, json["types"]
   end
   should 'respond with endpoint /search with more than 10 results' do
@@ -9,14 +9,14 @@ class ElasticsearchPluginEntitiesTest &lt; ActiveSupport::TestCase
   end
   def create_instances
-    user = create_user "sample person"
+    user = create_user "sample person", environment_id: 1
-    fast_create Community, name: "sample community", created_at: 10.days.ago,updated_at: 5.days.ago
-    fast_create UploadedFile, name: "sample uploadedfile", created_at: 3.days.ago, updated_at: 1.days.ago, author_id: user.person.id, abstract: "sample abstract"
-    fast_create Event, name: "sample event", created_at: 20.days.ago, updated_at: 5.days.ago, author_id: user.person.id, abstract: "sample abstract"
+    fast_create Community, name: "sample community", created_at: 10.days.ago,updated_at: 5.days.ago, environment_id: 1
-    fast_create RawHTMLArticle, name: "sample raw html article", created_at: 15.days.ago ,updated_at: 5.days.ago, author_id: user.person.id
-    fast_create TinyMceArticle, name: "sample tiny mce article", created_at: 5.days.ago, updated_at: 5.days.ago, author_id: user.person.id
+    fast_create UploadedFile, name: "sample uploadedfile", created_at: 3.days.ago, updated_at: 1.days.ago, author_id: user.person.id, abstract: "sample abstract", profile_id: user.person.id
+    fast_create Event, name: "sample event", created_at: 20.days.ago, updated_at: 5.days.ago, author_id: user.person.id, abstract: "sample abstract", profile_id: user.person.id
+    fast_create RawHTMLArticle, name: "sample raw html article", created_at: 15.days.ago ,updated_at: 5.days.ago, author_id: user.person.id, profile_id: user.person.id
+    fast_create TinyMceArticle, name: "sample tiny mce article", created_at: 5.days.ago, updated_at: 5.days.ago, author_id: user.person.id, profile_id: user.person.id
   end
   should 'show attributes from person' do
@@ -35,6 +35,7 @@ class ElasticsearchPluginEntitiesTest &lt; ActiveSupport::TestCase
     assert_equal expected_person.updated_at.strftime("%Y/%m/%d %H:%M:%S"), json['results'][0]['updated_at']
   end
+
   should 'show attributes from community' do
     params = {:selected_type => "community" }
     get "/api/v1/search?#{params.to_query}"
@@ -43,6 +44,7 @@ class ElasticsearchPluginEntitiesTest &lt; ActiveSupport::TestCase
     expected_community = Community.find_by name: "sample community"
     assert_equal 200, last_response.status
+
     assert_equal expected_community.id, json['results'][0]['id']
     assert_equal expected_community.name, json['results'][0]['name']
     assert_equal expected_community.type, json['results'][0]['type']
@@ -30,8 +30,8 @@ class ElasticsearchPluginControllerTest &lt; ActionController::TestCase
     assert_response :success
     assert_not_nil assigns(:searchable_types)
     assert_not_nil assigns(:selected_type)
-    assert_not_nil assigns(:filter_types)
-    assert_not_nil assigns(:selected_filter)
+    assert_not_nil assigns(:sort_types)
+    assert_not_nil assigns(:selected_sort)
   end
   should 'return 10 results if selected_type is nil and query is nil' do
@@ -32,17 +32,6 @@ class ElasticsearchHelperTest &lt; ActiveSupport::TestCase
     assert_equivalent indexed_models, searchable_models
   end
-  should 'return query_string if expression is valid' do
-
-    query= "my_query"
-    fields = ['name','login']
-    result = query_method(query,fields)
-
-    assert_includes result[:query][:query_string][:query], query
-    assert_equivalent result[:query][:query_string][:fields], fields
-  end
-
-
   should 'return fields from models using weight' do
     class StubClass
       SEARCHABLE_FIELDS = {:name  => {:weight => 10},
@@ -17,7 +17,7 @@ class CommunityTest &lt; ActionController::TestCase
   should 'index control fields for Community model' do
     Community::control_fields.each do |key, value|
       assert_includes indexed_fields(Community), key
-      assert_includes indexed_fields(Community)[key][:type], value[:type] || 'string'
+      assert_equal indexed_fields(Community)[key][:type], value[:type] || 'string'
     end
   end
@@ -17,7 +17,7 @@ class EventTest &lt; ActionController::TestCase
   should 'index control fields for Event model' do
     Event::control_fields.each do |key, value|
       assert_includes indexed_fields(Event), key
-      assert_includes indexed_fields(Event)[key][:type], value[:type] || 'string'
+      assert_equal indexed_fields(Event)[key][:type], value[:type] || 'string'
     end
   end
@@ -17,7 +17,7 @@ class PersonTest &lt; ActionController::TestCase
   should 'index control fields for Person model' do
     Person::control_fields.each do |key, value|
       assert_includes indexed_fields(Person), key
-      assert_includes indexed_fields(Person)[key][:type], value[:type] || 'string'
+      assert_equal indexed_fields(Person)[key][:type], value[:type] || 'string'
     end
   end
 end
@@ -17,7 +17,7 @@ class TextArticleTest &lt; ActionController::TestCase
   should 'index control fields for TextArticle model' do
     TextArticle::control_fields.each do |key, value|
       assert_includes indexed_fields(TextArticle), key
-      assert_includes indexed_fields(TextArticle)[key][:type], value[:type] || 'string'
+      assert_equal indexed_fields(TextArticle)[key][:type], value[:type] || 'string'
     end
   end
@@ -17,7 +17,7 @@ class UploadedFileTest &lt; ActionController::TestCase
   should 'index control fields for UploadedFile model' do
     UploadedFile::control_fields.each do |key, value|
       assert_includes indexed_fields(UploadedFile), key
-      assert_includes indexed_fields(UploadedFile)[key][:type], value[:type].presence || 'string'
+      assert_equal indexed_fields(UploadedFile)[key][:type], value[:type].presence || 'string'
     end
   end
@@ -27,7 +27,7 @@
       <ul class="search-options">
         <% for type,value in @searchable_types %>
           <li class="select-search-type <%= "active" if type == @selected_type %>">
-            <%= link_to  value[:label], "?selected_type=#{type}&query=#{@query}&filter=#{@selected_sort}"%>
+            <%= link_to value[:label], "?selected_type=#{type}&query=#{@query}"%>
           </li>
         <% end %>
       </ul>
	@@ -71,7 +71,6 @@ module ElasticsearchHelper		@@ -71,7 +71,6 @@ module ElasticsearchHelper
71		71
72	def query_string expression="", models=[]	72	def query_string expression="", models=[]
73	return { match_all: {} } if not expression	73	return { match_all: {} } if not expression
74	-
75	{	74	{
76	query_string: {	75	query_string: {
77	query: ""+expression.downcase.split.join(' ')+"",	76	query: ""+expression.downcase.split.join(' ')+"",
	@@ -10,7 +10,7 @@ class ElasticsearchPlugin::API < Grape::API		@@ -10,7 +10,7 @@ class ElasticsearchPlugin::API < Grape::API
10	target = process_results	10	target = process_results
11	present target,	11	present target,
12	:with => Elasticsearch::Entities::Result,	12	:with => Elasticsearch::Entities::Result,
13	- :types => ElasticsearchHelper.searchable_types.except(:all).keys.map { \|key\| key.to_s.classify }	13	+ :types => searchable_types.except(:all).keys.map { \|key\| key.to_s.classify }
14	end	14	end
15		15
16	get 'types' do	16	get 'types' do
	@@ -20,7 +20,7 @@ module ElasticsearchTestHelper		@@ -20,7 +20,7 @@ module ElasticsearchTestHelper
20	model.__elasticsearch__.create_index! force: true	20	model.__elasticsearch__.create_index! force: true
21	model.import	21	model.import
22	}	22	}
23	- sleep 2	23	+ sleep 3
24	end	24	end
25		25
26	def setup_environment	26	def setup_environment
	@@ -32,17 +32,6 @@ class ElasticsearchHelperTest < ActiveSupport::TestCase		@@ -32,17 +32,6 @@ class ElasticsearchHelperTest < ActiveSupport::TestCase
32	assert_equivalent indexed_models, searchable_models	32	assert_equivalent indexed_models, searchable_models
33	end	33	end
34		34
35	- should 'return query_string if expression is valid' do
36	-
37	- query= "my_query"
38	- fields = ['name','login']
39	- result = query_method(query,fields)
40	-
41	- assert_includes result[:query][:query_string][:query], query
42	- assert_equivalent result[:query][:query_string][:fields], fields
43	- end
44	-
45	-
46	should 'return fields from models using weight' do	35	should 'return fields from models using weight' do
47	class StubClass	36	class StubClass
48	SEARCHABLE_FIELDS = {:name => {:weight => 10},	37	SEARCHABLE_FIELDS = {:name => {:weight => 10},
	@@ -17,7 +17,7 @@ class CommunityTest < ActionController::TestCase		@@ -17,7 +17,7 @@ class CommunityTest < ActionController::TestCase
17	should 'index control fields for Community model' do	17	should 'index control fields for Community model' do
18	Community::control_fields.each do \|key, value\|	18	Community::control_fields.each do \|key, value\|
19	assert_includes indexed_fields(Community), key	19	assert_includes indexed_fields(Community), key
20	- assert_includes indexed_fields(Community)[key][:type], value[:type] \|\| 'string'	20	+ assert_equal indexed_fields(Community)[key][:type], value[:type] \|\| 'string'
21	end	21	end
22	end	22	end
23		23
	@@ -17,7 +17,7 @@ class EventTest < ActionController::TestCase		@@ -17,7 +17,7 @@ class EventTest < ActionController::TestCase
17	should 'index control fields for Event model' do	17	should 'index control fields for Event model' do
18	Event::control_fields.each do \|key, value\|	18	Event::control_fields.each do \|key, value\|
19	assert_includes indexed_fields(Event), key	19	assert_includes indexed_fields(Event), key
20	- assert_includes indexed_fields(Event)[key][:type], value[:type] \|\| 'string'	20	+ assert_equal indexed_fields(Event)[key][:type], value[:type] \|\| 'string'
21	end	21	end
22	end	22	end
23		23
	@@ -17,7 +17,7 @@ class PersonTest < ActionController::TestCase		@@ -17,7 +17,7 @@ class PersonTest < ActionController::TestCase
17	should 'index control fields for Person model' do	17	should 'index control fields for Person model' do
18	Person::control_fields.each do \|key, value\|	18	Person::control_fields.each do \|key, value\|
19	assert_includes indexed_fields(Person), key	19	assert_includes indexed_fields(Person), key
20	- assert_includes indexed_fields(Person)[key][:type], value[:type] \|\| 'string'	20	+ assert_equal indexed_fields(Person)[key][:type], value[:type] \|\| 'string'
21	end	21	end
22	end	22	end
23	end	23	end
	@@ -17,7 +17,7 @@ class TextArticleTest < ActionController::TestCase		@@ -17,7 +17,7 @@ class TextArticleTest < ActionController::TestCase
17	should 'index control fields for TextArticle model' do	17	should 'index control fields for TextArticle model' do
18	TextArticle::control_fields.each do \|key, value\|	18	TextArticle::control_fields.each do \|key, value\|
19	assert_includes indexed_fields(TextArticle), key	19	assert_includes indexed_fields(TextArticle), key
20	- assert_includes indexed_fields(TextArticle)[key][:type], value[:type] \|\| 'string'	20	+ assert_equal indexed_fields(TextArticle)[key][:type], value[:type] \|\| 'string'
21	end	21	end
22	end	22	end
23		23
	@@ -17,7 +17,7 @@ class UploadedFileTest < ActionController::TestCase		@@ -17,7 +17,7 @@ class UploadedFileTest < ActionController::TestCase
17	should 'index control fields for UploadedFile model' do	17	should 'index control fields for UploadedFile model' do
18	UploadedFile::control_fields.each do \|key, value\|	18	UploadedFile::control_fields.each do \|key, value\|
19	assert_includes indexed_fields(UploadedFile), key	19	assert_includes indexed_fields(UploadedFile), key
20	- assert_includes indexed_fields(UploadedFile)[key][:type], value[:type].presence \|\| 'string'	20	+ assert_equal indexed_fields(UploadedFile)[key][:type], value[:type].presence \|\| 'string'
21	end	21	end
22	end	22	end
23		23
	@@ -27,7 +27,7 @@		@@ -27,7 +27,7 @@
27	<ul class="search-options">	27	<ul class="search-options">
28	<% for type,value in @searchable_types %>	28	<% for type,value in @searchable_types %>
29	<li class="select-search-type <%= "active" if type == @selected_type %>">	29	<li class="select-search-type <%= "active" if type == @selected_type %>">
30	- <%= link_to value[:label], "?selected_type=#{type}&query=#{@query}&filter=#{@selected_sort}"%>	30	+ <%= link_to value[:label], "?selected_type=#{type}&query=#{@query}"%>
31	</li>	31	</li>
32	<% end %>	32	<% end %>
33	</ul>	33	</ul>