-
-
Notifications
You must be signed in to change notification settings - Fork 4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2596 from pascalgrimaud/travis-add-from-scratch-a…
…nd-cucumber Travis improvements : add from scratch and cucumber tests
- Loading branch information
Showing
14 changed files
with
254 additions
and
75 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| #!/bin/bash | ||
| set -ev | ||
| #------------------------------------------------------------------------------- | ||
| # Use jhipster-travis-build that contain .m2 and node_modules | ||
| #------------------------------------------------------------------------------- | ||
| cd $TRAVIS_BUILD_DIR/ | ||
| git clone https://github.com/jhipster/jhipster-travis-build.git | ||
| if [ $JHIPSTER != 'app-gradle' ]; then | ||
| rm -Rf $HOME/.m2/repository/ | ||
| mv $TRAVIS_BUILD_DIR/jhipster-travis-build/repository $HOME/.m2/ | ||
| ls -al $HOME/.m2/ | ||
| ls -al $HOME/.m2/repository/ | ||
| fi | ||
| if [ $JHIPSTER_NODE_CACHE == 1 ]; then | ||
| mv $TRAVIS_BUILD_DIR/jhipster-travis-build/node_modules/ $JHIPSTER_SAMPLES/$JHIPSTER/ | ||
| ls -al $JHIPSTER_SAMPLES/$JHIPSTER/ | ||
| fi |
93 changes: 93 additions & 0 deletions
93
travis/samples/app-from-scratch/.jhipster/BankAccount.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| { | ||
| "relationships": [ | ||
| { | ||
| "relationshipId": 1, | ||
| "relationshipName": "user", | ||
| "otherEntityName": "user", | ||
| "relationshipType": "many-to-one", | ||
| "otherEntityField": "login" | ||
| }, | ||
| { | ||
| "relationshipId": 2, | ||
| "relationshipName": "operation", | ||
| "otherEntityName": "operation", | ||
| "relationshipType": "one-to-many", | ||
| "otherEntityRelationshipName": "bankAccount" | ||
| } | ||
| ], | ||
| "fields": [ | ||
| { | ||
| "fieldId": 1, | ||
| "fieldName": "name", | ||
| "fieldType": "String", | ||
| "fieldValidateRules": [ | ||
| "required" | ||
| ] | ||
| }, | ||
| { | ||
| "fieldId": 2, | ||
| "fieldName": "bankNumber", | ||
| "fieldType": "Integer" | ||
| }, | ||
| { | ||
| "fieldId": 3, | ||
| "fieldName": "agencyNumber", | ||
| "fieldType": "Long" | ||
| }, | ||
| { | ||
| "fieldId": 4, | ||
| "fieldName": "lastOperationDuration", | ||
| "fieldType": "Float" | ||
| }, | ||
| { | ||
| "fieldId": 5, | ||
| "fieldName": "meanOperationDuration", | ||
| "fieldType": "Double" | ||
| }, | ||
| { | ||
| "fieldId": 6, | ||
| "fieldName": "balance", | ||
| "fieldType": "BigDecimal", | ||
| "fieldValidateRules": [ | ||
| "required" | ||
| ] | ||
| }, | ||
| { | ||
| "fieldId": 7, | ||
| "fieldName": "openingDay", | ||
| "fieldType": "LocalDate" | ||
| }, | ||
| { | ||
| "fieldId": 8, | ||
| "fieldName": "lastOperationDate", | ||
| "fieldType": "ZonedDateTime" | ||
| }, | ||
| { | ||
| "fieldId": 9, | ||
| "fieldName": "isActive", | ||
| "fieldType": "Boolean" | ||
| }, | ||
| { | ||
| "fieldId": 10, | ||
| "fieldName": "accountType", | ||
| "fieldType": "BankAccountType", | ||
| "fieldValues": "CHECKING,SAVINGS,LOAN" | ||
| }, | ||
| { | ||
| "fieldId": 11, | ||
| "fieldName": "attachment", | ||
| "fieldType": "byte[]", | ||
| "fieldTypeBlobContent": "any" | ||
| }, | ||
| { | ||
| "fieldId": 12, | ||
| "fieldName": "description", | ||
| "fieldType": "byte[]", | ||
| "fieldTypeBlobContent": "text" | ||
| } | ||
| ], | ||
| "changelogDate": "20150805124838", | ||
| "dto": "no", | ||
| "service": "no", | ||
| "pagination": "no" | ||
| } |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| { | ||
| "relationships": [ | ||
| { | ||
| "relationshipId": 1, | ||
| "relationshipName": "bankAccount", | ||
| "otherEntityName": "bankAccount", | ||
| "relationshipType": "many-to-one", | ||
| "otherEntityField": "name" | ||
| }, | ||
| { | ||
| "relationshipId": 2, | ||
| "relationshipName": "label", | ||
| "otherEntityName": "label", | ||
| "relationshipType": "many-to-many", | ||
| "otherEntityField": "label", | ||
| "ownerSide": true | ||
| } | ||
| ], | ||
| "fields": [ | ||
| { | ||
| "fieldId": 1, | ||
| "fieldName": "date", | ||
| "fieldType": "ZonedDateTime", | ||
| "fieldValidateRules": [ | ||
| "required" | ||
| ] | ||
| }, | ||
| { | ||
| "fieldId": 2, | ||
| "fieldName": "description", | ||
| "fieldType": "String" | ||
| }, | ||
| { | ||
| "fieldId": 3, | ||
| "fieldName": "amount", | ||
| "fieldType": "BigDecimal", | ||
| "fieldValidateRules": [ | ||
| "required" | ||
| ] | ||
| } | ||
| ], | ||
| "changelogDate": "20150805125054", | ||
| "dto": "no", | ||
| "service": "no", | ||
| "pagination": "no" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| { | ||
| "generator-jhipster": { | ||
| "baseName": "sampleFromScratch", | ||
| "packageName": "com.mycompany.myapp", | ||
| "packageFolder": "com/mycompany/myapp", | ||
| "authenticationType": "session", | ||
| "hibernateCache": "ehcache", | ||
| "clusteredHttpSession": "no", | ||
| "websocket": "no", | ||
| "databaseType": "sql", | ||
| "devDatabaseType": "h2Disk", | ||
| "prodDatabaseType": "mysql", | ||
| "searchEngine": "no", | ||
| "useSass": false, | ||
| "buildTool": "maven", | ||
| "frontendBuilder": "grunt", | ||
| "enableTranslation": true, | ||
| "enableSocialSignIn": false, | ||
| "rememberMeKey": "f19f0827c622eb9b81f5227a869ccd44932d78eb", | ||
| "testFrameworks": [ | ||
| "gatling" | ||
| ] | ||
| } | ||
| } |
File renamed without changes.
28 changes: 28 additions & 0 deletions
28
travis/samples/app-hazelcast-cucumber/.jhipster/Label.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| { | ||
| "relationships": [ | ||
| { | ||
| "relationshipId": 1, | ||
| "relationshipName": "operation", | ||
| "otherEntityName": "operation", | ||
| "relationshipType": "many-to-many", | ||
| "ownerSide": false, | ||
| "otherEntityRelationshipName": "label" | ||
| } | ||
| ], | ||
| "fields": [ | ||
| { | ||
| "fieldId": 1, | ||
| "fieldName": "label", | ||
| "fieldType": "String", | ||
| "fieldValidateRules": [ | ||
| "required", | ||
| "minlength" | ||
| ], | ||
| "fieldValidateRulesMinlength": "3" | ||
| } | ||
| ], | ||
| "changelogDate": "20150805124936", | ||
| "dto": "no", | ||
| "service": "no", | ||
| "pagination": "no" | ||
| } |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters