Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
cld
S
systems
sock-shop
carts
Commits
1cda3389
Commit
1cda3389
authored
Mar 09, 2017
by
Alexandru Giurgiu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
renamed the cart-db to carts-db
parent
fd7fb7f9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
src/main/java/works/weave/socks/cart/controllers/HealthCheckController.java
...s/weave/socks/cart/controllers/HealthCheckController.java
+1
-1
src/main/java/works/weave/socks/cart/entities/Item.java
src/main/java/works/weave/socks/cart/entities/Item.java
+1
-1
src/main/resources/application.properties
src/main/resources/application.properties
+1
-1
test/container.py
test/container.py
+3
-3
No files found.
src/main/java/works/weave/socks/cart/controllers/HealthCheckController.java
View file @
1cda3389
...
...
@@ -29,7 +29,7 @@ public class HealthCheckController {
Date
dateNow
=
Calendar
.
getInstance
().
getTime
();
HealthCheck
app
=
new
HealthCheck
(
"cart"
,
"OK"
,
dateNow
);
HealthCheck
database
=
new
HealthCheck
(
"cart-db"
,
"OK"
,
dateNow
);
HealthCheck
database
=
new
HealthCheck
(
"cart
s
-db"
,
"OK"
,
dateNow
);
try
{
mongoTemplate
.
executeCommand
(
"{ buildInfo: 1 }"
);
...
...
src/main/java/works/weave/socks/cart/entities/Item.java
View file @
1cda3389
...
...
@@ -103,4 +103,4 @@ public class Item {
public
void
setUnitPrice
(
float
unitPrice
)
{
this
.
unitPrice
=
unitPrice
;
}
}
\ No newline at end of file
}
src/main/resources/application.properties
View file @
1cda3389
server.port
=
${port:8081}
spring.data.mongodb.uri
=
mongodb://${db:cart-db}:27017/data
spring.data.mongodb.uri
=
mongodb://${db:cart
s
-db}:27017/data
endpoints.health.enabled
=
false
spring.zipkin.baseUrl
=
http://${zipkin:zipkin}:9411/
spring.sleuth.sampler.percentage
=
1.0
...
...
test/container.py
View file @
1cda3389
...
...
@@ -12,13 +12,13 @@ class CartContainerTest(unittest.TestCase):
TAG
=
"latest"
COMMIT
=
""
container_name
=
Docker
().
random_container_name
(
'carts'
)
mongo_container_name
=
Docker
().
random_container_name
(
'cart-db'
)
mongo_container_name
=
Docker
().
random_container_name
(
'cart
s
-db'
)
def
__init__
(
self
,
methodName
=
'runTest'
):
super
(
CartContainerTest
,
self
).
__init__
(
methodName
)
self
.
ip
=
""
def
setUp
(
self
):
Docker
().
start_container
(
container_name
=
self
.
mongo_container_name
,
image
=
"mongo"
,
host
=
"cart-db"
)
Docker
().
start_container
(
container_name
=
self
.
mongo_container_name
,
image
=
"mongo"
,
host
=
"cart
s
-db"
)
command
=
[
'docker'
,
'run'
,
'-d'
,
'--name'
,
CartContainerTest
.
container_name
,
...
...
@@ -44,7 +44,7 @@ class CartContainerTest(unittest.TestCase):
out
=
Dredd
().
test_against_endpoint
(
"carts"
,
"http://carts/"
,
links
=
[
self
.
mongo_container_name
,
self
.
container_name
],
env
=
[(
"MONGO_ENDPOINT"
,
"mongodb://cart-db:27017/data"
)],
env
=
[(
"MONGO_ENDPOINT"
,
"mongodb://cart
s
-db:27017/data"
)],
dump_streams
=
True
)
self
.
assertGreater
(
out
.
find
(
"0 failing"
),
-
1
)
self
.
assertGreater
(
out
.
find
(
"0 errors"
),
-
1
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment