Skip to content
This repository has been archived by the owner on Jun 2, 2023. It is now read-only.

Commit

Permalink
* Release 1.1.0: adding submodules and updating tests
Browse files Browse the repository at this point in the history
  • Loading branch information
cpretzer committed Jul 13, 2018
1 parent 5c348b7 commit 987a535
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
@@ -1,6 +1,6 @@
[submodule "mra-auth-proxy"]
path = mra-auth-proxy
url = https://github.com/nginxinc/mra-auth-proxy/
url = https://github.com/nginxinc/mra-auth-proxy
branch = stable
[submodule "mra-album-manager"]
path = mra-album-manager
Expand All @@ -24,5 +24,5 @@
branch = stable
[submodule "mra-user-manager"]
path = mra-user-manager
url = https://github.com/nginxinc/mra-user-manager/
url = https://github.com/nginxinc/mra-user-manager
branch = stable
2 changes: 1 addition & 1 deletion mra-pages
Submodule mra-pages updated 126 files
2 changes: 1 addition & 1 deletion mra-photoresizer
Submodule mra-photoresizer updated 41 files
+2 −1 .dockerignore
+14 −9 .gitignore
+0 −1 .gitkeep
+6 −1 Dockerfile
+49 −0 Jenkinsfile
+6 −6 README.md
+18 −5 app/PhotoResizer.yaml
+11 −6 app/src/main/java/com/nginx/image/PhotoResizerApplication.java
+107 −0 app/src/main/java/com/nginx/image/configs/HealthCheckConfiguration.java
+130 −0 app/src/main/java/com/nginx/image/configs/ImageSizeConfiguration.java
+51 −0 app/src/main/java/com/nginx/image/configs/PhotoResizerConfiguration.java
+72 −0 app/src/main/java/com/nginx/image/configs/ResizerConfiguration.java
+1 −1 app/src/main/java/com/nginx/image/core/ExifManager.java
+202 −0 app/src/main/java/com/nginx/image/core/PhotoIO.java
+73 −283 app/src/main/java/com/nginx/image/core/PhotoResizer.java
+146 −0 app/src/main/java/com/nginx/image/core/PhotoTransformer.java
+79 −0 app/src/main/java/com/nginx/image/health/CPUHealthCheck.java
+17 −7 app/src/main/java/com/nginx/image/health/DiskHealthCheck.java
+17 −5 app/src/main/java/com/nginx/image/health/MemoryHealthCheck.java
+11 −0 app/src/main/java/com/nginx/image/net/S3ClientFactory.java
+11 −4 app/src/main/java/com/nginx/image/resources/PhotoResizerResource.java
+6 −15 app/src/main/java/com/nginx/image/util/ImageSizeEnum.java
+3 −3 app/src/test/java/com/nginx/image/core/PhotoResizerTest.java
+1 −1 app/src/test/java/com/nginx/image/resources/PhotoResizerTestConfiguration.java
+18 −5 app/src/test/resources/PhotoResizer.yaml
+33 −10 app/start.sh
+70 −16 app/swagger.yaml
+56 −0 deploy/dcos/oss/mra-photoresizer.json
+57 −0 deploy/dcos/plus/mra-photoresizer.json
+49 −0 deploy/kubernetes/photoresizer-dep.yaml
+18 −0 deploy/kubernetes/photoresizer-svc.yaml
+35 −59 install-nginx.sh
+4 −4 nginx/README.md
+14 −0 nginx/fabric/fabric_config_dcos.yaml
+14 −0 nginx/fabric/fabric_config_k8s.yaml
+12 −0 nginx/fabric/fabric_config_local.yaml
+135 −0 nginx/fabric/fabric_nginx-plus.conf.j2
+133 −0 nginx/fabric/fabric_nginx.conf.j2
+1 −0 nginx/generate-custom-nginx-config.sh
+18 −0 nginx/generate-nginx-config.sh
+11 −0 status.html
3 changes: 3 additions & 0 deletions tests/ingenious-tests.js
Expand Up @@ -167,6 +167,8 @@ driver.get(host).then(() => {
driver.wait(until.elementIsEnabled(
photoUploadForm.findElement(By.xpath('//option[text()="album_' + startTime.getTime() + '"]'))
)).then(optionElement => {
console.log(optionElement);
driver.sleep(5000);
console.log('--- looking for option element');
driver.wait(until.elementIsVisible(optionElement));
return optionElement;
Expand Down Expand Up @@ -217,6 +219,7 @@ driver.get(host).then(() => {
driver.findElement(By.id('add-post-button')).click();
});
}).then(() => {
driver.sleep(5000);
console.log('-- Confirm that the post was uploaded');
driver.findElement(By.id('post-loading')).getText().then(uploadMessage => {
console.log('--- uploaded response message is: ' + uploadMessage);
Expand Down

0 comments on commit 987a535

Please sign in to comment.