Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
elasticsearch
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cubicweb
cubes
elasticsearch
Commits
bd4aa23e25e0
Commit
bd4aa23e25e0
authored
1 year ago
by
François Ferry
Browse files
Options
Downloads
Patches
Plain Diff
feat!: upgrade CubicWeb to version 4
parent
0240f6e210fa
No related branches found
No related tags found
1 merge request
!69
feat!: upgrade CubicWeb to version 4
Pipeline
#207046
canceled
1 year ago
Stage: lint
Stage: tests
Changes
4
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
cubicweb_elasticsearch/__pkginfo__.py
+2
-2
2 additions, 2 deletions
cubicweb_elasticsearch/__pkginfo__.py
test/data/bootstrap_cubes
+1
-1
1 addition, 1 deletion
test/data/bootstrap_cubes
test/test_elastic_search.py
+3
-3
3 additions, 3 deletions
test/test_elastic_search.py
tox.ini
+1
-0
1 addition, 0 deletions
tox.ini
with
7 additions
and
6 deletions
cubicweb_elasticsearch/__pkginfo__.py
+
2
−
2
View file @
bd4aa23e
...
...
@@ -14,8 +14,8 @@
web
=
f
"
https://forge.extranet.logilab.fr/cubicweb/cubes/
{
distname
}
"
__depends__
=
{
"
cubicweb
"
:
"
>=
3.38
.0, <
3.39
.0
"
,
"
six
"
:
"
>= 1.4
.0
"
,
"
cubicweb
"
:
"
>=
4.0
.0, <
5.0
.0
"
,
"
cubicweb-web
"
:
"
>= 1.0.0, < 2.0
.0
"
,
"
cwtags
"
:
None
,
"
elasticsearch
"
:
"
>=7.0.0,<8.0.0
"
,
"
elasticsearch-dsl
"
:
"
>=7.0.0,<8.0.0
"
,
...
...
This diff is collapsed.
Click to expand it.
test/data/bootstrap_cubes
+
1
−
1
View file @
bd4aa23e
elasticsearch,blog
elasticsearch,blog
,web
This diff is collapsed.
Click to expand it.
test/test_elastic_search.py
+
3
−
3
View file @
bd4aa23e
...
...
@@ -7,7 +7,7 @@
from
elasticsearch_dsl.faceted_search
import
FacetedResponse
from
elasticsearch_dsl.search
import
Search
from
cubicweb.devtools
import
testlib
from
cubicweb
_web
.devtools
import
testlib
from
cubicweb.cwconfig
import
CubicWebConfiguration
from
cubicweb_elasticsearch
import
ccplugin
from
cubicweb_elasticsearch.es
import
indexable_types
,
fulltext_indexable_rql
...
...
@@ -150,7 +150,7 @@
return
True
class
ElasticSearchViewsTC
(
testlib
.
Cubic
WebTC
):
class
ElasticSearchViewsTC
(
testlib
.
Web
CW
TC
):
# TODO generate X tests ranging the number of results from 1 to 150
@patch
(
"
elasticsearch_dsl.search.Search.execute
"
,
new
=
mock_execute_1
)
@patch
(
"
elasticsearch_dsl.connections.connections.get_connection
"
,
new
=
mock_cnx
)
...
...
@@ -174,7 +174,7 @@
self
.
view
(
"
esearch
"
,
req
=
req
,
template
=
None
)
class
ElasticsearchTC
(
testlib
.
Cubic
WebTC
):
class
ElasticsearchTC
(
testlib
.
Web
CW
TC
):
def
test_1
(
self
):
with
self
.
admin_access
.
cnx
()
as
cnx
:
etype
=
"
Person
"
...
...
This diff is collapsed.
Click to expand it.
tox.ini
+
1
−
0
View file @
bd4aa23e
...
...
@@ -5,6 +5,7 @@
sitepackages
=
true
deps
=
pytest
webtest
cubicweb-blog
mock
git+https://github.com/psycojoker/pytest-capture-deprecatedwarnings
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment