phpci

phpci.yml

@@ -11,31 +11,28 @@ build_settings:
 
 setup:
     composer:
-#        directory: ""
         action: "install"
         prefer_dist: true
         no_dev: true
     pgsql:
-        - "UPDATE pg_database SET datallowconn='false' WHERE datname='fhctest';"
-        - "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname='fhctest';"
+        - "UPDATE pg_database SET datallowconn = 'false' WHERE datname = 'fhctest';"
+        - "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE pid <> pg_backend_pid() AND datname = 'fhctest';"
         - "DROP DATABASE IF EXISTS fhctest;"
+        - "CREATE DATABASE fhctest OWNER fhcomplete;"
     shell:
-#        - "pkill -f fhctest &"
-#        - "sudo -u postgres psql fhctest -c 'DROP DATABASE IF EXISTS fhctest;'"
-        - "cd %BUILD_PATH% && chmod u+x install.sh && ./install.sh fhctest" # Install Database
-        - "rm -f /var/www/html/build/fhcomplete" # SymLink löschen falls vorhanden
-        - "ln -s %BUILD_PATH% /var/www/html/build/fhcomplete" # SymLink to the actual build
-#        - "php index.ci.php DBTools migrate" # DB-Migration
+        #- "cd %BUILD_PATH% && chmod u+x install.sh && ./install.sh fhctest" # Install Database
+        - "cd %BUILD_PATH% && php index.ci.php DBTools migrate" # Install Database
+        - "rm -f /var/www/phpci/PHPCI/build/fhcomplete.ci" # SymLink löschen falls vorhanden
+        - "ln -s %BUILD_PATH% /var/www/phpci/PHPCI/build/fhcomplete.ci" # SymLink to the actual build
 
 test:
     lint:
         directories:
-        - "application/"
-        recursive: true
+            - "application/"
+            recursive: true
     codeception:
         config: "tests/codeception/"
         path: "tests/codeception/_output/"
-#    php_loc:
 #    php_docblock_checker:
 #        path: "application/controllers/"
 #        allowed_warnings: 100
@@ -49,28 +46,7 @@ test:
 #        directory: "tests/phpunit/"
 
 complete:
-    clean_build:
-        remove:
-            - index.php
-            - config/global.config.inc.php
-            - config/cis.config.inc.php
-            - config/vilesci.config.inc.php
-            - config/system.config.inc.php
-#    xmpp:
-#        username: "fhcomplete"
-#        password: "fhcomplete1q2w3blah.im"
-#        recipients:
-#            - "fhcomplete@darkness.su"
-#            - "nk@jabber.at" 
-#            - "tschux@jabber.org"
-#            - "tschux@jabber.at"      
-#        server: "jabber.blah.im"
-#        tls: 1
-#        alias: "jabber.blah.im"
-#        date_format: "%d.%m.%Y"
-
-success:
-#    shell:
-#        - "cd %BUILD_PATH% && chmod u+x copyBuild.sh && ./copyBuild.sh" # Copy Build
-#        - "curl 'http://localhost/backend/Migrate/'" # DB-Installation
-#        - "cd /var/www/html/ && sudo -u wsp doxygen Doxyfile" # Doxygen
+    pgsql:
+        - "UPDATE pg_database SET datallowconn = 'false' WHERE datname = 'fhctest';"
+        - "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE pid <> pg_backend_pid() AND datname = 'fhctest';"
+        - "DROP DATABASE IF EXISTS fhctest;"

tests/codeception/tests/acceptance.suite.dist.yml

@@ -9,7 +9,7 @@ modules:
     enabled:
         - Db
         - PhpBrowser:
-            url: 'http://admin:1q2w3@demo.fhcomplete.org/ci/'
+            url: 'http://test.fhcomplete.org/fhcomplete.ci/'
     config:
         Db:
             dsn: 'pgsql:host=localhost;port=5432;dbname=fhctest'

tests/codeception/tests/api.suite.dist.yml

@@ -4,7 +4,7 @@ modules:
         - Db
         - REST:
             # API URL
-            url: 'http://admin:1q2w3@demo.fhcomplete.org/ci/index.ci.php/api/'
+            url: 'http://test.fhcomplete.org/fhcomplete.ci/index.ci.php/api/'
             # Can also be a framework module name
             depends: PhpBrowser
             # Limits PhpBrowser to JSON or XML