Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
perxis-go
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Package registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
perxis
perxis-go
Commits
57e77656
Commit
57e77656
authored
1 year ago
by
ensiouel
Browse files
Options
Downloads
Patches
Plain Diff
fix(items): исправлены тесты
parent
340d55e1
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
pkg/items/middleware/caching_middleware_test.go
+22
-19
22 additions, 19 deletions
pkg/items/middleware/caching_middleware_test.go
with
22 additions
and
19 deletions
pkg/items/middleware/caching_middleware_test.go
+
22
−
19
View file @
57e77656
...
@@ -11,6 +11,8 @@ import (
...
@@ -11,6 +11,8 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/items"
itmsmocks
"git.perx.ru/perxis/perxis-go/pkg/items/mocks"
itmsmocks
"git.perx.ru/perxis/perxis-go/pkg/items/mocks"
"git.perx.ru/perxis/perxis-go/pkg/metrics"
"github.com/prometheus/client_golang/prometheus"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/require"
...
@@ -32,12 +34,13 @@ func TestItemsCache(t *testing.T) {
...
@@ -32,12 +34,13 @@ func TestItemsCache(t *testing.T) {
errNotFound
:=
errors
.
NotFound
(
errors
.
New
(
"not found"
))
errNotFound
:=
errors
.
NotFound
(
errors
.
New
(
"not found"
))
ctx
:=
context
.
Background
()
ctx
:=
context
.
Background
()
cacheMetrics
:=
metrics
.
NewCacheMetrics
(
prometheus
.
DefaultRegisterer
)
t
.
Run
(
"Get from cache"
,
func
(
t
*
testing
.
T
)
{
t
.
Run
(
"Get from cache"
,
func
(
t
*
testing
.
T
)
{
itms
:=
&
itmsmocks
.
Items
{}
itms
:=
&
itmsmocks
.
Items
{}
env
:=
&
envmocks
.
Environments
{}
env
:=
&
envmocks
.
Environments
{}
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
env
)(
itms
)
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
cacheMetrics
,
env
)(
itms
)
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
itms
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StateDraft
},
nil
)
.
Once
()
itms
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StateDraft
},
nil
)
.
Once
()
...
@@ -61,7 +64,7 @@ func TestItemsCache(t *testing.T) {
...
@@ -61,7 +64,7 @@ func TestItemsCache(t *testing.T) {
itms
:=
&
itmsmocks
.
Items
{}
itms
:=
&
itmsmocks
.
Items
{}
env
:=
&
envmocks
.
Environments
{}
env
:=
&
envmocks
.
Environments
{}
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
env
)(
itms
)
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
cacheMetrics
,
env
)(
itms
)
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
itms
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envAlias
,
colID
,
itemID
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StateDraft
},
nil
)
.
Once
()
itms
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envAlias
,
colID
,
itemID
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StateDraft
},
nil
)
.
Once
()
...
@@ -85,7 +88,7 @@ func TestItemsCache(t *testing.T) {
...
@@ -85,7 +88,7 @@ func TestItemsCache(t *testing.T) {
itms
:=
&
itmsmocks
.
Items
{}
itms
:=
&
itmsmocks
.
Items
{}
env
:=
&
envmocks
.
Environments
{}
env
:=
&
envmocks
.
Environments
{}
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
env
)(
itms
)
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
cacheMetrics
,
env
)(
itms
)
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
itms
.
On
(
"GetPublished"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
,
mock
.
Anything
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StateDraft
},
nil
)
.
Once
()
itms
.
On
(
"GetPublished"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
,
mock
.
Anything
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StateDraft
},
nil
)
.
Once
()
...
@@ -109,7 +112,7 @@ func TestItemsCache(t *testing.T) {
...
@@ -109,7 +112,7 @@ func TestItemsCache(t *testing.T) {
itms
:=
&
itmsmocks
.
Items
{}
itms
:=
&
itmsmocks
.
Items
{}
env
:=
&
envmocks
.
Environments
{}
env
:=
&
envmocks
.
Environments
{}
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
env
)(
itms
)
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
cacheMetrics
,
env
)(
itms
)
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
itms
.
On
(
"GetPublished"
,
mock
.
Anything
,
spaceID
,
envAlias
,
colID
,
itemID
,
mock
.
Anything
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StateDraft
},
nil
)
.
Once
()
itms
.
On
(
"GetPublished"
,
mock
.
Anything
,
spaceID
,
envAlias
,
colID
,
itemID
,
mock
.
Anything
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StateDraft
},
nil
)
.
Once
()
...
@@ -138,7 +141,7 @@ func TestItemsCache(t *testing.T) {
...
@@ -138,7 +141,7 @@ func TestItemsCache(t *testing.T) {
itms
:=
&
itmsmocks
.
Items
{}
itms
:=
&
itmsmocks
.
Items
{}
env
:=
&
envmocks
.
Environments
{}
env
:=
&
envmocks
.
Environments
{}
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
env
)(
itms
)
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
cacheMetrics
,
env
)(
itms
)
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Twice
()
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Twice
()
itms
.
On
(
"GetPublished"
,
mock
.
Anything
,
spaceID
,
envAlias
,
colID
,
itemID
,
mock
.
Anything
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StateDraft
},
nil
)
.
Once
()
itms
.
On
(
"GetPublished"
,
mock
.
Anything
,
spaceID
,
envAlias
,
colID
,
itemID
,
mock
.
Anything
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StateDraft
},
nil
)
.
Once
()
...
@@ -176,7 +179,7 @@ func TestItemsCache(t *testing.T) {
...
@@ -176,7 +179,7 @@ func TestItemsCache(t *testing.T) {
env
:=
&
envmocks
.
Environments
{}
env
:=
&
envmocks
.
Environments
{}
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
env
)(
itms
)
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
cacheMetrics
,
env
)(
itms
)
itms
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
Data
:
map
[
string
]
interface
{}{
"f1"
:
"d1"
}},
nil
)
.
Once
()
itms
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
Data
:
map
[
string
]
interface
{}{
"f1"
:
"d1"
}},
nil
)
.
Once
()
...
@@ -208,7 +211,7 @@ func TestItemsCache(t *testing.T) {
...
@@ -208,7 +211,7 @@ func TestItemsCache(t *testing.T) {
itms
:=
&
itmsmocks
.
Items
{}
itms
:=
&
itmsmocks
.
Items
{}
env
:=
&
envmocks
.
Environments
{}
env
:=
&
envmocks
.
Environments
{}
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
env
)(
itms
)
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
cacheMetrics
,
env
)(
itms
)
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
itms
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StateDraft
},
nil
)
.
Once
()
itms
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StateDraft
},
nil
)
.
Once
()
...
@@ -241,7 +244,7 @@ func TestItemsCache(t *testing.T) {
...
@@ -241,7 +244,7 @@ func TestItemsCache(t *testing.T) {
itms
:=
&
itmsmocks
.
Items
{}
itms
:=
&
itmsmocks
.
Items
{}
env
:=
&
envmocks
.
Environments
{}
env
:=
&
envmocks
.
Environments
{}
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
env
)(
itms
)
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
cacheMetrics
,
env
)(
itms
)
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
itms
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StateDraft
},
nil
)
.
Once
()
itms
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StateDraft
},
nil
)
.
Once
()
...
@@ -273,7 +276,7 @@ func TestItemsCache(t *testing.T) {
...
@@ -273,7 +276,7 @@ func TestItemsCache(t *testing.T) {
itms
:=
&
itmsmocks
.
Items
{}
itms
:=
&
itmsmocks
.
Items
{}
env
:=
&
envmocks
.
Environments
{}
env
:=
&
envmocks
.
Environments
{}
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
env
)(
itms
)
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
cacheMetrics
,
env
)(
itms
)
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
itms
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StatePublished
},
nil
)
.
Once
()
itms
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StatePublished
},
nil
)
.
Once
()
...
@@ -313,7 +316,7 @@ func TestItemsCache(t *testing.T) {
...
@@ -313,7 +316,7 @@ func TestItemsCache(t *testing.T) {
itms
:=
&
itmsmocks
.
Items
{}
itms
:=
&
itmsmocks
.
Items
{}
env
:=
&
envmocks
.
Environments
{}
env
:=
&
envmocks
.
Environments
{}
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
env
)(
itms
)
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
cacheMetrics
,
env
)(
itms
)
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
itms
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StatePublished
},
nil
)
.
Once
()
itms
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StatePublished
},
nil
)
.
Once
()
...
@@ -346,7 +349,7 @@ func TestItemsCache(t *testing.T) {
...
@@ -346,7 +349,7 @@ func TestItemsCache(t *testing.T) {
itms
:=
&
itmsmocks
.
Items
{}
itms
:=
&
itmsmocks
.
Items
{}
env
:=
&
envmocks
.
Environments
{}
env
:=
&
envmocks
.
Environments
{}
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
env
)(
itms
)
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
cacheMetrics
,
env
)(
itms
)
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
itms
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StateDraft
},
nil
)
.
Once
()
itms
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StateDraft
},
nil
)
.
Once
()
...
@@ -379,7 +382,7 @@ func TestItemsCache(t *testing.T) {
...
@@ -379,7 +382,7 @@ func TestItemsCache(t *testing.T) {
itms
:=
&
itmsmocks
.
Items
{}
itms
:=
&
itmsmocks
.
Items
{}
env
:=
&
envmocks
.
Environments
{}
env
:=
&
envmocks
.
Environments
{}
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
env
)(
itms
)
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
cacheMetrics
,
env
)(
itms
)
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
itms
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
Data
:
map
[
string
]
interface
{}{
"f1"
:
"d1"
}},
nil
)
.
Once
()
itms
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
Data
:
map
[
string
]
interface
{}{
"f1"
:
"d1"
}},
nil
)
.
Once
()
...
@@ -412,7 +415,7 @@ func TestItemsCache(t *testing.T) {
...
@@ -412,7 +415,7 @@ func TestItemsCache(t *testing.T) {
itms
:=
&
itmsmocks
.
Items
{}
itms
:=
&
itmsmocks
.
Items
{}
env
:=
&
envmocks
.
Environments
{}
env
:=
&
envmocks
.
Environments
{}
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
env
)(
itms
)
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
cacheMetrics
,
env
)(
itms
)
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
itms
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StatePublished
},
nil
)
.
Once
()
itms
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StatePublished
},
nil
)
.
Once
()
...
@@ -445,7 +448,7 @@ func TestItemsCache(t *testing.T) {
...
@@ -445,7 +448,7 @@ func TestItemsCache(t *testing.T) {
itms
:=
&
itmsmocks
.
Items
{}
itms
:=
&
itmsmocks
.
Items
{}
env
:=
&
envmocks
.
Environments
{}
env
:=
&
envmocks
.
Environments
{}
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
env
)(
itms
)
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
cacheMetrics
,
env
)(
itms
)
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
itms
.
On
(
"GetPublished"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
,
mock
.
Anything
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StatePublished
,
Data
:
map
[
string
]
interface
{}{
"f1"
:
"d1"
}},
nil
)
.
Once
()
itms
.
On
(
"GetPublished"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
,
mock
.
Anything
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StatePublished
,
Data
:
map
[
string
]
interface
{}{
"f1"
:
"d1"
}},
nil
)
.
Once
()
...
@@ -486,7 +489,7 @@ func TestItemsCache(t *testing.T) {
...
@@ -486,7 +489,7 @@ func TestItemsCache(t *testing.T) {
itms
:=
&
itmsmocks
.
Items
{}
itms
:=
&
itmsmocks
.
Items
{}
env
:=
&
envmocks
.
Environments
{}
env
:=
&
envmocks
.
Environments
{}
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
env
)(
itms
)
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
cacheMetrics
,
env
)(
itms
)
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
itms
.
On
(
"GetPublished"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
,
mock
.
Anything
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StateDraft
},
nil
)
.
Once
()
itms
.
On
(
"GetPublished"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
,
mock
.
Anything
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StateDraft
},
nil
)
.
Once
()
...
@@ -527,7 +530,7 @@ func TestItemsCache(t *testing.T) {
...
@@ -527,7 +530,7 @@ func TestItemsCache(t *testing.T) {
itms
:=
&
itmsmocks
.
Items
{}
itms
:=
&
itmsmocks
.
Items
{}
env
:=
&
envmocks
.
Environments
{}
env
:=
&
envmocks
.
Environments
{}
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
env
)(
itms
)
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
cacheMetrics
,
env
)(
itms
)
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
itms
.
On
(
"GetPublished"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
,
mock
.
Anything
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StatePublished
},
nil
)
.
Once
()
itms
.
On
(
"GetPublished"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
,
mock
.
Anything
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StatePublished
},
nil
)
.
Once
()
...
@@ -568,7 +571,7 @@ func TestItemsCache(t *testing.T) {
...
@@ -568,7 +571,7 @@ func TestItemsCache(t *testing.T) {
itms
:=
&
itmsmocks
.
Items
{}
itms
:=
&
itmsmocks
.
Items
{}
env
:=
&
envmocks
.
Environments
{}
env
:=
&
envmocks
.
Environments
{}
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
env
)(
itms
)
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
cacheMetrics
,
env
)(
itms
)
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
itms
.
On
(
"GetPublished"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
,
mock
.
Anything
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StatePublished
},
nil
)
.
Once
()
itms
.
On
(
"GetPublished"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
,
mock
.
Anything
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StatePublished
},
nil
)
.
Once
()
...
@@ -609,7 +612,7 @@ func TestItemsCache(t *testing.T) {
...
@@ -609,7 +612,7 @@ func TestItemsCache(t *testing.T) {
itms
:=
&
itmsmocks
.
Items
{}
itms
:=
&
itmsmocks
.
Items
{}
env
:=
&
envmocks
.
Environments
{}
env
:=
&
envmocks
.
Environments
{}
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
env
)(
itms
)
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
cacheMetrics
,
env
)(
itms
)
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
...
@@ -657,7 +660,7 @@ func TestItemsCache(t *testing.T) {
...
@@ -657,7 +660,7 @@ func TestItemsCache(t *testing.T) {
itms
:=
&
itmsmocks
.
Items
{}
itms
:=
&
itmsmocks
.
Items
{}
env
:=
&
envmocks
.
Environments
{}
env
:=
&
envmocks
.
Environments
{}
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
env
)(
itms
)
svc
:=
CachingMiddleware
(
cache
.
NewCache
(
size
,
ttl
),
cache
.
NewCache
(
size
,
ttl
),
cacheMetrics
,
env
)(
itms
)
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
env
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
)
.
Return
(
&
environments
.
Environment
{
ID
:
envID
,
SpaceID
:
spaceID
,
Aliases
:
[]
string
{
envAlias
}},
nil
)
.
Once
()
itms
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StateDraft
},
nil
)
.
Once
()
itms
.
On
(
"Get"
,
mock
.
Anything
,
spaceID
,
envID
,
colID
,
itemID
)
.
Return
(
&
items
.
Item
{
ID
:
itemID
,
SpaceID
:
spaceID
,
EnvID
:
envID
,
CollectionID
:
colID
,
State
:
items
.
StateDraft
},
nil
)
.
Once
()
...
...
This diff is collapsed.
Click to expand it.
Semyon Krestyaninov
@krestyaninov
mentioned in commit
97a379f7
·
1 year ago
mentioned in commit
97a379f7
mentioned in commit 97a379f735d19e60cea4ea666a94ee3d5be3e9b3
Toggle commit list
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