Run CI against latest JHipster release (#465)

jhipster · Mar 18, 2021 · ac7ec76 · ac7ec76
1 parent e2b947d
commit ac7ec76
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 114 deletions.
diff --git a/.github/workflows/ionic.yml b/.github/workflows/ionic.yml
@@ -95,8 +95,8 @@ jobs:
         run: |
           date
           npm -g install yo @ionic/cli
-          git clone https://github.com/jhipster/jhipster-bom.git
-          cd jhipster-bom && ./mvnw install -q -ntp -DskipTests -Dgpg.skip=true
+          #git clone https://github.com/jhipster/jhipster-bom.git
+          #cd jhipster-bom && ./mvnw install -q -ntp -DskipTests -Dgpg.skip=true
           chmod +x $JHIPSTER_INSTALL/*.sh
           chmod +x $JHIPSTER_SCRIPTS/*.sh
       - name: Install JHipster Stack

diff --git a/generators/app/templates/e2e/spec/login.e2e-spec.ts.ejs b/generators/app/templates/e2e/spec/login.e2e-spec.ts.ejs
@@ -28,7 +28,7 @@ describe('Login', () => {
     }
     <%_ } else { _%>
     // Keycloak
-    const alert = element(by.css('#input-error'));
+    const alert = element(by.css('.alert-error'));
     if (await alert.isPresent()) {
       expect(await alert.getText()).toMatch('Invalid username or password.');
     } else {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
   },
   "devDependencies": {
     "@angular-devkit/schematics-cli": "0.1102.4",
-    "@oktadev/schematics": "3.3.0",
+    "@oktadev/schematics": "3.4.0",
     "chai": "4.3.4",
     "eslint": "7.22.0",
     "eslint-config-airbnb-base": "14.2.1",

diff --git a/test-integration/install/01-install-jhipster-stack.sh b/test-integration/install/01-install-jhipster-stack.sh
@@ -15,16 +15,17 @@ echo $IONIC4J_BRANCH
 # Clone JHipster
 #-------------------------------------------------------------------------------
 cd "$HOME"
-git clone $JHIPSTER_REPO generator-jhipster
-cd generator-jhipster
-if [ "$JHIPSTER_BRANCH" == "latest" ]; then
-    LATEST=$(git describe --abbrev=0)
-    git checkout -b $LATEST $LATEST
-elif [ "$JHIPSTER_BRANCH" != "main" ]; then
-    git checkout -b $JHIPSTER_BRANCH origin/$JHIPSTER_BRANCH
-fi
-git --no-pager log -n 10 --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
-npm link
+npm i -g generator-jhipster
+#git clone $JHIPSTER_REPO generator-jhipster
+#cd generator-jhipster
+#if [ "$JHIPSTER_BRANCH" == "latest" ]; then
+#    LATEST=$(git describe --abbrev=0)
+#    git checkout -b $LATEST $LATEST
+#elif [ "$JHIPSTER_BRANCH" != "main" ]; then
+#    git checkout -b $JHIPSTER_BRANCH origin/$JHIPSTER_BRANCH
+#fi
+#git --no-pager log -n 10 --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
+#npm link
 
 #-------------------------------------------------------------------------------
 # Link Ionic

diff --git a/test-integration/jdl/gateway-oauth2.jdl b/test-integration/jdl/gateway-oauth2.jdl
@@ -2,13 +2,9 @@ application {
   config {
     baseName gateway
     applicationType gateway
-    reactive true
     authenticationType oauth2
     packageName org.jhipster.demo.blog
-    databaseType mongodb
-    devDatabaseType mongodb
-    prodDatabaseType mongodb
-    enableHibernateCache false
+    prodDatabaseType postgresql
     buildTool maven
     clientFramework angular
     testFrameworks [protractor]

diff --git a/test-integration/scripts/01-generate-project.sh b/test-integration/scripts/01-generate-project.sh
@@ -15,7 +15,7 @@ fi
 mkdir -p "$HOME/$APP_FOLDER"
 cp -f "$JHIPSTER_SAMPLES"/"$JHIPSTER".jdl "$HOME/$APP_FOLDER"/
 cd "$HOME/$APP_FOLDER"
-npm link generator-jhipster
+# npm link generator-jhipster
 jhipster import-jdl "$JHIPSTER".jdl --force --no-insight --skip-checks --skip-git --skip-commit-hook --skip-install
 
 #-------------------------------------------------------------------------------