Ruleset adjustments

.eslintrc

@@ -7,8 +7,6 @@
     "@lwc/lwc/no-deprecated": "error",
     "@lwc/lwc/no-document-query": "error",
     "@lwc/lwc/no-leading-uppercase-api-name": "error",
-    "@lwc/lwc/no-unexpected-wire-adapter-usages": "error",
-    "@lwc/lwc/no-unknown-wire-adapters": "error",
     "@lwc/lwc/valid-api": "error",
     "@lwc/lwc/valid-track": "error",
     "@lwc/lwc/valid-wire": "error",

ruleset.xml

@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ruleset xmlns="http://pmd.sourceforge.net/ruleset/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Default ruleset used by the CodeClimate Engine for Salesforce.com Apex" xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
-   <description>Default ruleset for PMD/Codacy</description>
-
-    <rule ref="category/apex/security.xml">
-        <priority>1</priority>
-    </rule>
+    <description>Default ruleset for PMD/Codacy</description>
 
+    <rule ref="category/apex/codestyle.xml" />
     <rule ref="category/apex/design.xml" />
-
+    <rule ref="category/apex/errorprone.xml" />
+    <rule ref="category/apex/multithreading.xml" />
     <rule ref="category/apex/performance.xml" />
 
-    <rule ref="category/apex/codestyle.xml">
-        <exclude name="EmptyCatchBlock"/>
+    <rule ref="category/apex/security.xml">
+        <priority>1</priority>
     </rule>
 
     <rule ref="category/apex/bestpractices.xml">
@@ -21,5 +19,4 @@
     <rule ref="category/apex/documentation.xml">
         <exclude name="ApexDoc"/>
     </rule>
-
 </ruleset>

scripts/createScratchOrg.sh

@@ -1,50 +1,29 @@
 #!/bin/bash
 source `dirname $0`/config.sh
 
-holdScreen=true
-while getopts 'p' flag; do
-  case "${flag}" in
-    p) holdScreen=false ;;
-  esac
-done
-
 execute() {
-    $@ > temp.json
-    cat temp.json
-    $(jq '.status == 0' temp.json) || $holdScreen || exit 1
-}
-
-executenpm() {
-    $@
-    $(jq '.success' temp.json) || $holdScreen || exit 1
+  $@ || exit
 }
 
+if [ -z "$DEV_HUB_URL" ]; then
+  echo "set default devhub user"
+  execute sfdx force:config:set defaultdevhubusername=$DEV_HUB_ALIAS
 
-echo "deleting old scratch org"
-sfdx force:org:delete -p -u $SCRATCH_ORG_ALIAS
+  echo "deleting old scratch org"
+  sfdx force:org:delete -p -u $SCRATCH_ORG_ALIAS
+fi
 
 echo "Creating scratch ORG"
-sfdx force:org:create -a $SCRATCH_ORG_ALIAS -s -f ./config/project-scratch-def.json -d 1
+execute sfdx force:org:create -a $SCRATCH_ORG_ALIAS -s -f ./config/project-scratch-def.json -d 30
 
 echo "Pushing changes to scratch org"
-execute "sfdx force:source:push --json"
+execute sfdx force:source:push
 
 echo "Assigning permission"
-execute "sfdx force:user:permset:assign --json -n Admin"
-
-echo "Running apex tests"
-execute "sfdx force:apex:test:run -l RunLocalTests -w 30 --json"
+execute sfdx force:user:permset:assign -n PlantUml
 
+echo "Make sure Org user is english"
+sfdx force:data:record:update -s User -w "Name='User User'" -v "Languagelocalekey=en_US"
 
-echo "Running jest tests"
-npm install
-executenpm "npm run test:unit"
-
-rm temp.json
-
-if $holdScreen 
-then
-    echo "Org is set up"
-    read
-fi
-
+echo "Running apex tests"
+execute sfdx force:apex:test:run -l RunLocalTests -w 30