Merge branch 'master' of bitbucket.org:colosa/processmaker
This commit is contained in:
@@ -2,5 +2,36 @@
|
|||||||
default:
|
default:
|
||||||
context:
|
context:
|
||||||
parameters:
|
parameters:
|
||||||
base_url: http://192.168.11.181/api/1.0/michelangelo/
|
base_url: http://processmaker-ip-or-domain/api/1.0/[workspace]/
|
||||||
access_token: cd5cff9b2e3ebabf49e276e47e977fab5988c00e
|
access_token: e79057f4276661bedb6154eed3834f6cbd738853
|
||||||
|
client_id: x-pm-local-client
|
||||||
|
client_secret: 179ad45c6ce2cb97cf1029e212046e81
|
||||||
|
#uploadFilesFolder: /opt/uploadfiles
|
||||||
|
#cd5cff9b2e3ebabf49e276e47e977fab5988c00e
|
||||||
|
login_url: http://processmaker-ip-or-domaint/sys[workspace]/en/neoclassic/login/login
|
||||||
|
authentication_url: http://processmaker-ip-or-domain/sys[workspace]/en/neoclassic/login/authentication.php
|
||||||
|
oauth_app_url: http://processmaker-ip-or-domaint/sys[workspace]/en/neoclassic/oauth2/clientSetupAjax
|
||||||
|
oauth_authorization_url: http://processmaker-ip-or-domain/[workspace]/oauth2/authorize
|
||||||
|
user_name: <your-admin-username>
|
||||||
|
user_password: <your-admin-password>
|
||||||
|
|
||||||
|
# Database connection parameters
|
||||||
|
# To Mysql
|
||||||
|
mys_db_type: mysql
|
||||||
|
mys_db_server: <your-mysql-server-ip>
|
||||||
|
mys_db_name: <your-db-name>
|
||||||
|
mys_db_username: <your-db-username>
|
||||||
|
mys_db_password:<your-db-password>
|
||||||
|
mys_db_port: 3306
|
||||||
|
mys_db_encode: utf8
|
||||||
|
mys_db_description: Mysql connection
|
||||||
|
|
||||||
|
# To SQL Server
|
||||||
|
sqlsrv_db_type: mssql
|
||||||
|
sqlsrv_db_server: <your-myssql-server-ip>
|
||||||
|
sqlsrv_db_name: <your-db-name>
|
||||||
|
sqlsrv_db_username: <your-db-username>
|
||||||
|
sqlsrv_db_password: <your-db-password>
|
||||||
|
sqlsrv_db_port: 1433
|
||||||
|
sqlsrv_db_encode: utf8
|
||||||
|
sqlsrv_db_description: Microsoft SQL Server connection
|
||||||
@@ -9,25 +9,30 @@ Feature: DataBase Connections
|
|||||||
And the response has 0 record
|
And the response has 0 record
|
||||||
|
|
||||||
|
|
||||||
Scenario: Create a new database connection
|
Scenario Outline: Create a new database connection
|
||||||
Given that I have a valid access_token
|
Given that I have a valid access_token
|
||||||
And POST this data:
|
And POST this data:
|
||||||
"""
|
"""
|
||||||
{
|
{
|
||||||
"dbs_type": "mysql",
|
"dbs_type": "<dbs_type>",
|
||||||
"dbs_server": "michelangelo-be.colosa.net",
|
"dbs_server": "<dbs_server>",
|
||||||
"dbs_database_name": "test",
|
"dbs_database_name": "<dbs_database_name>",
|
||||||
"dbs_username": "testuser",
|
"dbs_username": "<dbs_username>",
|
||||||
"dbs_password": "sample",
|
"dbs_password": "<dbs_password>",
|
||||||
"dbs_port": 3306,
|
"dbs_port": <dbs_port>,
|
||||||
"dbs_encode": "utf8",
|
"dbs_encode": "<dbs_encode>",
|
||||||
"dbs_description": "conection correcta"
|
"dbs_description": "<dbs_description>"
|
||||||
}
|
}
|
||||||
"""
|
"""
|
||||||
And I request "project/74737540052e1641ab88249082085472/database-connection"
|
And I request "project/74737540052e1641ab88249082085472/database-connection"
|
||||||
Then the response status code should be 201
|
Then the response status code should be 201
|
||||||
And store "dbs_uid" in session array
|
And store "dbs_uid" in session array
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
| dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description |
|
||||||
|
| <mys_db_type> | <mys_db_server> | <mys_db_name> | <mys_db_username> | <mys_db_password> | <mys_db_port> | <mys_db_encode> | <mys_db_description> |
|
||||||
|
|
||||||
|
|
||||||
@3: TEST FOR GET DATABASE CONNECTIONS /----------------------------------------------------------------------
|
@3: TEST FOR GET DATABASE CONNECTIONS /----------------------------------------------------------------------
|
||||||
Scenario: List all the database connections (result 1 database connection)
|
Scenario: List all the database connections (result 1 database connection)
|
||||||
Given that I have a valid access_token
|
Given that I have a valid access_token
|
||||||
@@ -37,19 +42,19 @@ Feature: DataBase Connections
|
|||||||
And the response has 1 record
|
And the response has 1 record
|
||||||
|
|
||||||
@4: TEST FOR PUT DATABASE CONNECTION /-----------------------------------------------------------------------
|
@4: TEST FOR PUT DATABASE CONNECTION /-----------------------------------------------------------------------
|
||||||
Scenario: Update a database connection
|
Scenario Outline: Update a database connection
|
||||||
Given that I have a valid access_token
|
Given that I have a valid access_token
|
||||||
And PUT this data:
|
And PUT this data:
|
||||||
"""
|
"""
|
||||||
{
|
{
|
||||||
"dbs_type": "mysql",
|
"dbs_type": "<dbs_type>",
|
||||||
"dbs_server": "michelangelo-be.colosa.net",
|
"dbs_server": "<dbs_server>",
|
||||||
"dbs_database_name": "test",
|
"dbs_database_name": "<dbs_database_name>",
|
||||||
"dbs_username": "testuser",
|
"dbs_username": "<dbs_username>",
|
||||||
"dbs_password": "sample",
|
"dbs_password": "<dbs_password>",
|
||||||
"dbs_port": 3306,
|
"dbs_port": <dbs_port>,
|
||||||
"dbs_encode": "utf8",
|
"dbs_encode": "<dbs_encode>",
|
||||||
"dbs_description": "conection correcta a workflow"
|
"dbs_description": "<dbs_description>"
|
||||||
}
|
}
|
||||||
"""
|
"""
|
||||||
And that I want to update a resource with the key "dbs_uid" stored in session array
|
And that I want to update a resource with the key "dbs_uid" stored in session array
|
||||||
@@ -58,6 +63,10 @@ Feature: DataBase Connections
|
|||||||
And the response charset is "UTF-8"
|
And the response charset is "UTF-8"
|
||||||
And the type is "object"
|
And the type is "object"
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
| dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description |
|
||||||
|
| <mys_db_type> | <mys_db_server> | <mys_db_name> | <mys_db_username> | <mys_db_password> | <mys_db_port> | <mys_db_encode> | <mys_db_description> |
|
||||||
|
|
||||||
|
|
||||||
Scenario: Get a database connection (with change in "dbs_description" and "dbs_database_name")
|
Scenario: Get a database connection (with change in "dbs_description" and "dbs_database_name")
|
||||||
Given that I have a valid access_token
|
Given that I have a valid access_token
|
||||||
|
|||||||
@@ -1,13 +1,16 @@
|
|||||||
@ProcessMakerMichelangelo @RestAPI
|
@ProcessMakerMichelangelo @RestAPI
|
||||||
Feature: DataBase Connections Main Tests MySQL
|
Feature: DataBase Connections Main Tests Mysql
|
||||||
Requirements:
|
Requirements:
|
||||||
a workspace with the process 74737540052e1641ab88249082085472 ("Data Base Connenctions") already loaded
|
A workspace with previous creation of process with ID=74737540052e1641ab88249082085472 ("Data Base Connections") already loaded
|
||||||
and workspace with the project 87648819953a85c0abc01d3080475981 ("testExecutionOfDerivationScreen") already loaded
|
and workspace with the project 87648819953a85c0abc01d3080475981 ("testExecutionOfDerivationScreen") already loaded
|
||||||
there are zero Database Connections in the process
|
there are zero Database Connections in the processes.
|
||||||
|
|
||||||
Background:
|
Background:
|
||||||
Given that I have a valid access_token
|
Given that I have a valid access_token
|
||||||
|
|
||||||
|
|
||||||
|
# GET /api/1.0/{workspace}/project/<project-id>/database-connections
|
||||||
|
# Get list DataBase| dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description | Connections
|
||||||
Scenario Outline: Get the DataBase Connections List when there are exactly zero DataBase Connections
|
Scenario Outline: Get the DataBase Connections List when there are exactly zero DataBase Connections
|
||||||
Given I request "project/<project>/database-connections"
|
Given I request "project/<project>/database-connections"
|
||||||
Then the response status code should be 200
|
Then the response status code should be 200
|
||||||
@@ -15,12 +18,14 @@ Feature: DataBase Connections Main Tests MySQL
|
|||||||
And the response has <record> record
|
And the response has <record> record
|
||||||
|
|
||||||
Examples:
|
Examples:
|
||||||
|
| project | record |
|
||||||
| test_description | project | record |
|
| 106912358530c9b14ac15d3001790900 | 0 |
|
||||||
| List DB in the process Data Base Connenctions .pm | 74737540052e1641ab88249082085472 | 0 |
|
| 1265557095225ff5c688f46031700471 | 0 |
|
||||||
| List DB in the process testExecutionOfDerivationScreen .pmx | 87648819953a85c0abc01d3080475981 | 0 |
|
|
||||||
|
|
||||||
|
|
||||||
|
# POST /api/1.0/{workspace}/project/<project-id>/database-connection/test
|
||||||
|
# Test DataBase Connection
|
||||||
|
@MysqlDbConnection
|
||||||
Scenario Outline: Test database connection to test
|
Scenario Outline: Test database connection to test
|
||||||
Given POST this data:
|
Given POST this data:
|
||||||
"""
|
"""
|
||||||
@@ -42,12 +47,14 @@ Feature: DataBase Connections Main Tests MySQL
|
|||||||
And the content type is "application/json"
|
And the content type is "application/json"
|
||||||
|
|
||||||
Examples:
|
Examples:
|
||||||
|
| dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description |
|
||||||
| test_description | dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description |
|
| 1 | 106912358530c9b14ac15d3001790900 | <mys_db_type> | <mys_db_server> | <mys_db_name> | <mys_db_username> | <mys_db_password> | <mys_db_port> | <mys_db_encode> | <mys_db_description> |
|
||||||
| Test SQL Server db connection .pm | 1 | 74737540052e1641ab88249082085472 | microsoft sql server | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | SQL Server connection |
|
| 2 | 1265557095225ff5c688f46031700471 | <mys_db_type> | <mys_db_server> | <mys_db_name> | <mys_db_username> | <mys_db_password> | <mys_db_port> | <mys_db_encode> | <mys_db_description> |
|
||||||
| Test SQL Server db connection .pmx | 2 | 87648819953a85c0abc01d3080475981 | microsoft sql server | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | SQL Server connection |
|
|
||||||
|
|
||||||
|
|
||||||
|
# POST /api/1.0/{workspace}/project/<project-id>/database-connection
|
||||||
|
# Create new DataBase Connection
|
||||||
|
@MysqlDbConnection
|
||||||
Scenario Outline: Create a new database connection
|
Scenario Outline: Create a new database connection
|
||||||
Given database-connection with id "<dbs_uid_number>" is active
|
Given database-connection with id "<dbs_uid_number>" is active
|
||||||
And POST this data:
|
And POST this data:
|
||||||
@@ -71,12 +78,13 @@ Feature: DataBase Connections Main Tests MySQL
|
|||||||
And store "dbs_uid" in session array as variable "dbs_uid_<dbs_uid_number>"
|
And store "dbs_uid" in session array as variable "dbs_uid_<dbs_uid_number>"
|
||||||
|
|
||||||
Examples:
|
Examples:
|
||||||
|
| dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description |
|
||||||
| test_description | dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description |
|
| 1 | 106912358530c9b14ac15d3001790900 | <mys_db_type> | <mys_db_server> | <mys_db_name> | <mys_db_username> | <mys_db_password> | <mys_db_port> | <mys_db_encode> | <mys_db_description> |
|
||||||
| Create SQL Server db connection .pm | 1 | 74737540052e1641ab88249082085472 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | SQL Server connection |
|
| 2 | 1265557095225ff5c688f46031700471 | <mys_db_type> | <mys_db_server> | <mys_db_name> | <mys_db_username> | <mys_db_password> | <mys_db_port> | <mys_db_encode> | <mys_db_description> |
|
||||||
| Create SQL Server db connection .pmx | 2 | 87648819953a85c0abc01d3080475981 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | SQL Server connection |
|
|
||||||
|
|
||||||
|
|
||||||
|
# GET /api/1.0/{workspace}/project/<project-id>/database-connection
|
||||||
|
# Get DataBase Connections list of each process
|
||||||
Scenario Outline: Get the DataBase Connections List when there are exactly one DataBase Connections in each process
|
Scenario Outline: Get the DataBase Connections List when there are exactly one DataBase Connections in each process
|
||||||
Given database-connection with id "<dbs_uid_number>" is active
|
Given database-connection with id "<dbs_uid_number>" is active
|
||||||
And I request "project/<project>/database-connections"
|
And I request "project/<project>/database-connections"
|
||||||
@@ -85,13 +93,14 @@ Feature: DataBase Connections Main Tests MySQL
|
|||||||
And the response has <record> record
|
And the response has <record> record
|
||||||
|
|
||||||
Examples:
|
Examples:
|
||||||
|
| project | record | dbs_uid_number |
|
||||||
| test_description | project | record | dbs_uid_number |
|
| 106912358530c9b14ac15d3001790900 | 1 | 1 |
|
||||||
| List DB in the process Data Base Connenctions .pm | 74737540052e1641ab88249082085472 | 1 | 1 |
|
| 1265557095225ff5c688f46031700471 | 1 | 2 |
|
||||||
| List DB in the process testExecutionOfDerivationScreen .pmx | 87648819953a85c0abc01d3080475981 | 1 | 2 |
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# PUT /api/1.0/{workspace}/project/<project-id>/database-connection
|
||||||
|
# Update a DataBase Connection
|
||||||
|
@MysqlDbConnection
|
||||||
Scenario Outline: Update a database connection
|
Scenario Outline: Update a database connection
|
||||||
Given database-connection with id "<dbs_uid_number>" is active
|
Given database-connection with id "<dbs_uid_number>" is active
|
||||||
And PUT this data:
|
And PUT this data:
|
||||||
@@ -114,12 +123,14 @@ Feature: DataBase Connections Main Tests MySQL
|
|||||||
And the type is "object"
|
And the type is "object"
|
||||||
|
|
||||||
Examples:
|
Examples:
|
||||||
|
| dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description |
|
||||||
| test_description | dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description |
|
| 1 | 106912358530c9b14ac15d3001790900 | <mys_db_type> | <mys_db_server> | <mys_db_name> | <mys_db_username> | <mys_db_password> | <mys_db_port> | <mys_db_encode> | <mys_db_description> |
|
||||||
| Update sql server db connection .pm | 1 | 74737540052e1641ab88249082085472 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | update SQL Server connection |
|
| 2 | 1265557095225ff5c688f46031700471 | <mys_db_type> | <mys_db_server> | <mys_db_name> | <mys_db_username> | <mys_db_password> | <mys_db_port> | <mys_db_encode> | <mys_db_description> |
|
||||||
| Update sql server db connection .pmx | 2 | 87648819953a85c0abc01d3080475981 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | update SQL Server connection |
|
|
||||||
|
|
||||||
|
|
||||||
|
# GET /api/1.0/{workspace}/project/<project-id>/database-connection
|
||||||
|
# Get a single DataBase Connection and their properties
|
||||||
|
@MysqlDbConnection
|
||||||
Scenario Outline: Get a single database connection and check some properties
|
Scenario Outline: Get a single database connection and check some properties
|
||||||
Given database-connection with id "<dbs_uid_number>" is active
|
Given database-connection with id "<dbs_uid_number>" is active
|
||||||
And that I want to get a resource with the key "dbs_uid" stored in session array as variable "dbs_uid_<dbs_uid_number>"
|
And that I want to get a resource with the key "dbs_uid" stored in session array as variable "dbs_uid_<dbs_uid_number>"
|
||||||
@@ -137,13 +148,14 @@ Feature: DataBase Connections Main Tests MySQL
|
|||||||
And that "dbs_description" is set to "<dbs_description>"
|
And that "dbs_description" is set to "<dbs_description>"
|
||||||
|
|
||||||
Examples:
|
Examples:
|
||||||
|
| dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description |
|
||||||
| test_description | dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description |
|
| 1 | 106912358530c9b14ac15d3001790900 | <mys_db_type> | <mys_db_server> | <mys_db_name> | <mys_db_username> | <mys_db_password> | <mys_db_port> | <mys_db_encode> | <mys_db_description> |
|
||||||
| Update sql server db connection .pm | 1 | 74737540052e1641ab88249082085472 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | update SQL Server connection |
|
| 2 | 1265557095225ff5c688f46031700471 | <mys_db_type> | <mys_db_server> | <mys_db_name> | <mys_db_username> | <mys_db_password> | <mys_db_port> | <mys_db_encode> | <mys_db_description> |
|
||||||
| Update sql server db connection .pmx | 2 | 87648819953a85c0abc01d3080475981 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | update SQL Server connection |
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Delete all Database Connection created previously in this script
|
# DELETE /api/1.0/{workspace}/project/<project-id>/database-connection
|
||||||
|
# Delete all DataBase Connections created in this script
|
||||||
|
Scenario Outline: Delete all Database Connection created in this script
|
||||||
Given database-connection with id "<dbs_uid_number>" is active
|
Given database-connection with id "<dbs_uid_number>" is active
|
||||||
And that I want to delete a resource with the key "dbs_uid" stored in session array as variable "dbs_uid_<dbs_uid_number>"
|
And that I want to delete a resource with the key "dbs_uid" stored in session array as variable "dbs_uid_<dbs_uid_number>"
|
||||||
And I request "project/<project>/database-connection"
|
And I request "project/<project>/database-connection"
|
||||||
@@ -152,12 +164,13 @@ Feature: DataBase Connections Main Tests MySQL
|
|||||||
And the type is "object"
|
And the type is "object"
|
||||||
|
|
||||||
Examples:
|
Examples:
|
||||||
|
|
||||||
| project | dbs_uid_number |
|
| project | dbs_uid_number |
|
||||||
| 74737540052e1641ab88249082085472 | 1 |
|
| 106912358530c9b14ac15d3001790900 | 1 |
|
||||||
| 87648819953a85c0abc01d3080475981 | 2 |
|
| 1265557095225ff5c688f46031700471 | 2 |
|
||||||
|
|
||||||
|
|
||||||
|
# GET /api/1.0/{workspace}/project/<project-id>/database-connection
|
||||||
|
# Get DataBase Connections list
|
||||||
Scenario Outline: Get the DataBase Connections List when there are exactly zero DataBase Connections
|
Scenario Outline: Get the DataBase Connections List when there are exactly zero DataBase Connections
|
||||||
Given database-connection with id "<dbs_uid_number>" is active
|
Given database-connection with id "<dbs_uid_number>" is active
|
||||||
And I request "project/<project>/database-connections"
|
And I request "project/<project>/database-connections"
|
||||||
@@ -166,7 +179,6 @@ Feature: DataBase Connections Main Tests MySQL
|
|||||||
And the response has <record> record
|
And the response has <record> record
|
||||||
|
|
||||||
Examples:
|
Examples:
|
||||||
|
| project | record | dbs_uid_number |
|
||||||
| test_description | project | record | dbs_uid_number |
|
| 106912358530c9b14ac15d3001790900 | 0 | 1 |
|
||||||
| List DB in the process Data Base Connenctions .pm | 74737540052e1641ab88249082085472 | 0 | 1 |
|
| 1265557095225ff5c688f46031700471 | 0 | 2 |
|
||||||
| List DB in the process testExecutionOfDerivationScreen .pmx | 87648819953a85c0abc01d3080475981 | 0 | 2 |
|
|
||||||
@@ -1,13 +1,16 @@
|
|||||||
@ProcessMakerMichelangelo @RestAPI
|
@ProcessMakerMichelangelo @RestAPI
|
||||||
Feature: DataBase Connections Main Tests SQL Server
|
Feature: DataBase Connections Main Tests SQL Server
|
||||||
Requirements:
|
Requirements:
|
||||||
a workspace with the process 74737540052e1641ab88249082085472 ("Data Base Connenctions") already loaded
|
A workspace with previous creation of process with ID=74737540052e1641ab88249082085472 ("Data Base Connections") already loaded
|
||||||
and workspace with the project 87648819953a85c0abc01d3080475981 ("testExecutionOfDerivationScreen") already loaded
|
and workspace with the project 87648819953a85c0abc01d3080475981 ("testExecutionOfDerivationScreen") already loaded
|
||||||
there are zero Database Connections in the processes
|
there are zero Database Connections in the processes.
|
||||||
|
|
||||||
Background:
|
Background:
|
||||||
Given that I have a valid access_token
|
Given that I have a valid access_token
|
||||||
|
|
||||||
|
|
||||||
|
# GET /api/1.0/{workspace}/project/<project-id>/database-connections
|
||||||
|
# Get list DataBase Connections
|
||||||
Scenario Outline: Get the DataBase Connections List when there are exactly zero DataBase Connections
|
Scenario Outline: Get the DataBase Connections List when there are exactly zero DataBase Connections
|
||||||
Given I request "project/<project>/database-connections"
|
Given I request "project/<project>/database-connections"
|
||||||
Then the response status code should be 200
|
Then the response status code should be 200
|
||||||
@@ -15,12 +18,14 @@ Feature: DataBase Connections Main Tests SQL Server
|
|||||||
And the response has <record> record
|
And the response has <record> record
|
||||||
|
|
||||||
Examples:
|
Examples:
|
||||||
|
| project | record |
|
||||||
| test_description | project | record |
|
| 106912358530c9b14ac15d3001790900 | 0 |
|
||||||
| List DB in the process Data Base Connenctions .pm | 74737540052e1641ab88249082085472 | 0 |
|
| 1265557095225ff5c688f46031700471 | 0 |
|
||||||
| List DB in the process testExecutionOfDerivationScreen .pmx | 87648819953a85c0abc01d3080475981 | 0 |
|
|
||||||
|
|
||||||
|
|
||||||
|
# POST /api/1.0/{workspace}/project/<project-id>/database-connection/test
|
||||||
|
# Test DataBase Connection
|
||||||
|
@SqlServerDbConnection
|
||||||
Scenario Outline: Test database connection to test
|
Scenario Outline: Test database connection to test
|
||||||
Given POST this data:
|
Given POST this data:
|
||||||
"""
|
"""
|
||||||
@@ -42,12 +47,14 @@ Feature: DataBase Connections Main Tests SQL Server
|
|||||||
And the content type is "application/json"
|
And the content type is "application/json"
|
||||||
|
|
||||||
Examples:
|
Examples:
|
||||||
|
| dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description |
|
||||||
| test_description | dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description |
|
| 1 | 106912358530c9b14ac15d3001790900 | <sqlsrv_db_type> | <sqlsrv_db_server> | <sqlsrv_db_name> | <sqlsrv_db_username> | <sqlsrv_db_password> | <sqlsrv_db_port> | <sqlsrv_db_encode> | <sqlsrv_db_description> |
|
||||||
| Test SQL Server db connection .pm | 1 | 74737540052e1641ab88249082085472 | microsoft sql server | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | SQL Server connection |
|
| 2 | 1265557095225ff5c688f46031700471 | <sqlsrv_db_type> | <sqlsrv_db_server> | <sqlsrv_db_name> | <sqlsrv_db_username> | <sqlsrv_db_password> | <sqlsrv_db_port> | <sqlsrv_db_encode> | <sqlsrv_db_description> |
|
||||||
| Test SQL Server db connection .pmx | 2 | 87648819953a85c0abc01d3080475981 | microsoft sql server | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | SQL Server connection |
|
|
||||||
|
|
||||||
|
|
||||||
|
# POST /api/1.0/{workspace}/project/<project-id>/database-connection
|
||||||
|
# Create new DataBase Connection
|
||||||
|
@SqlServerDbConnection
|
||||||
Scenario Outline: Create a new database connection
|
Scenario Outline: Create a new database connection
|
||||||
Given database-connection with id "<dbs_uid_number>" is active
|
Given database-connection with id "<dbs_uid_number>" is active
|
||||||
And POST this data:
|
And POST this data:
|
||||||
@@ -71,12 +78,13 @@ Feature: DataBase Connections Main Tests SQL Server
|
|||||||
And store "dbs_uid" in session array as variable "dbs_uid_<dbs_uid_number>"
|
And store "dbs_uid" in session array as variable "dbs_uid_<dbs_uid_number>"
|
||||||
|
|
||||||
Examples:
|
Examples:
|
||||||
|
| dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description |
|
||||||
| test_description | dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description |
|
| 1 | 106912358530c9b14ac15d3001790900 | <sqlsrv_db_type> | <sqlsrv_db_server> | <sqlsrv_db_name> | <sqlsrv_db_username> | <sqlsrv_db_password> | <sqlsrv_db_port> | <sqlsrv_db_encode> | <sqlsrv_db_description> |
|
||||||
| Create SQL Server db connection .pm | 1 | 74737540052e1641ab88249082085472 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | SQL Server connection |
|
| 2 | 1265557095225ff5c688f46031700471 | <sqlsrv_db_type> | <sqlsrv_db_server> | <sqlsrv_db_name> | <sqlsrv_db_username> | <sqlsrv_db_password> | <sqlsrv_db_port> | <sqlsrv_db_encode> | <sqlsrv_db_description> |
|
||||||
| Create SQL Server db connection .pmx | 2 | 87648819953a85c0abc01d3080475981 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | SQL Server connection |
|
|
||||||
|
|
||||||
|
|
||||||
|
# GET /api/1.0/{workspace}/project/<project-id>/database-connection
|
||||||
|
# Get DataBase Connections list of each process
|
||||||
Scenario Outline: Get the DataBase Connections List when there are exactly one DataBase Connections in each process
|
Scenario Outline: Get the DataBase Connections List when there are exactly one DataBase Connections in each process
|
||||||
Given database-connection with id "<dbs_uid_number>" is active
|
Given database-connection with id "<dbs_uid_number>" is active
|
||||||
And I request "project/<project>/database-connections"
|
And I request "project/<project>/database-connections"
|
||||||
@@ -85,12 +93,14 @@ Feature: DataBase Connections Main Tests SQL Server
|
|||||||
And the response has <record> record
|
And the response has <record> record
|
||||||
|
|
||||||
Examples:
|
Examples:
|
||||||
|
| project | record | dbs_uid_number |
|
||||||
| test_description | project | record | dbs_uid_number |
|
| 106912358530c9b14ac15d3001790900 | 1 | 1 |
|
||||||
| List DB in the process Data Base Connenctions .pm | 74737540052e1641ab88249082085472 | 1 | 1 |
|
| 1265557095225ff5c688f46031700471 | 1 | 2 |
|
||||||
| List DB in the process testExecutionOfDerivationScreen .pmx | 87648819953a85c0abc01d3080475981 | 1 | 2 |
|
|
||||||
|
|
||||||
|
|
||||||
|
# PUT /api/1.0/{workspace}/project/<project-id>/database-connection
|
||||||
|
# Update a DataBase Connection
|
||||||
|
@SqlServerDbConnection
|
||||||
Scenario Outline: Update a database connection
|
Scenario Outline: Update a database connection
|
||||||
Given database-connection with id "<dbs_uid_number>" is active
|
Given database-connection with id "<dbs_uid_number>" is active
|
||||||
And PUT this data:
|
And PUT this data:
|
||||||
@@ -113,12 +123,14 @@ Feature: DataBase Connections Main Tests SQL Server
|
|||||||
And the type is "object"
|
And the type is "object"
|
||||||
|
|
||||||
Examples:
|
Examples:
|
||||||
|
| dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description |
|
||||||
| test_description | dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description |
|
| 1 | 106912358530c9b14ac15d3001790900 | <sqlsrv_db_type> | <sqlsrv_db_server> | <sqlsrv_db_name> | <sqlsrv_db_username> | <sqlsrv_db_password> | <sqlsrv_db_port> | <sqlsrv_db_encode> | <sqlsrv_db_description> |
|
||||||
| Update sql server db connection .pm | 1 | 74737540052e1641ab88249082085472 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | update SQL Server connection |
|
| 2 | 1265557095225ff5c688f46031700471 | <sqlsrv_db_type> | <sqlsrv_db_server> | <sqlsrv_db_name> | <sqlsrv_db_username> | <sqlsrv_db_password> | <sqlsrv_db_port> | <sqlsrv_db_encode> | <sqlsrv_db_description> |
|
||||||
| Update sql server db connection .pmx | 2 | 87648819953a85c0abc01d3080475981 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | update SQL Server connection |
|
|
||||||
|
|
||||||
|
|
||||||
|
# GET /api/1.0/{workspace}/project/<project-id>/database-connection
|
||||||
|
# Get a single DataBase Connection and their properties
|
||||||
|
@SqlServerDbConnection
|
||||||
Scenario Outline: Get a single database connection and check some properties
|
Scenario Outline: Get a single database connection and check some properties
|
||||||
Given database-connection with id "<dbs_uid_number>" is active
|
Given database-connection with id "<dbs_uid_number>" is active
|
||||||
And that I want to get a resource with the key "dbs_uid" stored in session array as variable "dbs_uid_<dbs_uid_number>"
|
And that I want to get a resource with the key "dbs_uid" stored in session array as variable "dbs_uid_<dbs_uid_number>"
|
||||||
@@ -136,13 +148,14 @@ Feature: DataBase Connections Main Tests SQL Server
|
|||||||
And that "dbs_description" is set to "<dbs_description>"
|
And that "dbs_description" is set to "<dbs_description>"
|
||||||
|
|
||||||
Examples:
|
Examples:
|
||||||
|
| dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description |
|
||||||
| test_description | dbs_uid_number | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description |
|
| 1 | 106912358530c9b14ac15d3001790900 | <sqlsrv_db_type> | <sqlsrv_db_server> | <sqlsrv_db_name> | <sqlsrv_db_username> | <sqlsrv_db_password> | <sqlsrv_db_port> | <sqlsrv_db_encode> | <sqlsrv_db_description> |
|
||||||
| Update sql server db connection .pm | 1 | 74737540052e1641ab88249082085472 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | update SQL Server connection |
|
| 2 | 1265557095225ff5c688f46031700471 | <sqlsrv_db_type> | <sqlsrv_db_server> | <sqlsrv_db_name> | <sqlsrv_db_username> | <sqlsrv_db_password> | <sqlsrv_db_port> | <sqlsrv_db_encode> | <sqlsrv_db_description> |
|
||||||
| Update sql server db connection .pmx | 2 | 87648819953a85c0abc01d3080475981 | mssql | 192.168.11.99 | wf_michelangelo | sa | mafe12345 | 1433 | utf8 | update SQL Server connection |
|
|
||||||
|
|
||||||
|
|
||||||
Scenario Outline: Delete all Database Connection created previously in this script
|
# DELETE /api/1.0/{workspace}/project/<project-id>/database-connection
|
||||||
|
# Delete all DataBase Connections created in this script
|
||||||
|
Scenario Outline: Delete all Database Connection created in this script
|
||||||
Given database-connection with id "<dbs_uid_number>" is active
|
Given database-connection with id "<dbs_uid_number>" is active
|
||||||
And that I want to delete a resource with the key "dbs_uid" stored in session array as variable "dbs_uid_<dbs_uid_number>"
|
And that I want to delete a resource with the key "dbs_uid" stored in session array as variable "dbs_uid_<dbs_uid_number>"
|
||||||
And I request "project/<project>/database-connection"
|
And I request "project/<project>/database-connection"
|
||||||
@@ -151,12 +164,13 @@ Feature: DataBase Connections Main Tests SQL Server
|
|||||||
And the type is "object"
|
And the type is "object"
|
||||||
|
|
||||||
Examples:
|
Examples:
|
||||||
|
|
||||||
| project | dbs_uid_number |
|
| project | dbs_uid_number |
|
||||||
| 74737540052e1641ab88249082085472 | 1 |
|
| 106912358530c9b14ac15d3001790900 | 1 |
|
||||||
| 87648819953a85c0abc01d3080475981 | 2 |
|
| 1265557095225ff5c688f46031700471 | 2 |
|
||||||
|
|
||||||
|
|
||||||
|
# GET /api/1.0/{workspace}/project/<project-id>/database-connection
|
||||||
|
# Get DataBase Connections list
|
||||||
Scenario Outline: Get the DataBase Connections List when there are exactly zero DataBase Connections
|
Scenario Outline: Get the DataBase Connections List when there are exactly zero DataBase Connections
|
||||||
Given database-connection with id "<dbs_uid_number>" is active
|
Given database-connection with id "<dbs_uid_number>" is active
|
||||||
And I request "project/<project>/database-connections"
|
And I request "project/<project>/database-connections"
|
||||||
@@ -165,7 +179,6 @@ Feature: DataBase Connections Main Tests SQL Server
|
|||||||
And the response has <record> record
|
And the response has <record> record
|
||||||
|
|
||||||
Examples:
|
Examples:
|
||||||
|
| project | record | dbs_uid_number |
|
||||||
| test_description | project | record | dbs_uid_number |
|
| 106912358530c9b14ac15d3001790900 | 0 | 1 |
|
||||||
| List DB in the process Data Base Connenctions .pm | 74737540052e1641ab88249082085472 | 0 | 1 |
|
| 1265557095225ff5c688f46031700471 | 0 | 2 |
|
||||||
| List DB in the process testExecutionOfDerivationScreen .pmx | 87648819953a85c0abc01d3080475981 | 0 | 2 |
|
|
||||||
@@ -22,31 +22,34 @@ Feature: DataBase Connections Negative Tests
|
|||||||
Then the response status code should be <error_code>
|
Then the response status code should be <error_code>
|
||||||
And the response status message should have the following text "<error_message>"
|
And the response status message should have the following text "<error_message>"
|
||||||
|
|
||||||
|
|
||||||
Examples:
|
Examples:
|
||||||
|
| test_description | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description | error_code | error_message |
|
||||||
| test_description | project | dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_encode | dbs_description | error_code | error_message |
|
| Field required dbs_type | 74737540052e1641ab88249082085472 | | <mys_db_server> | <mys_db_name> | <mys_db_username> | <mys_db_password> | <mys_db_port> | <mys_db_encode> | mysql connection | 400 | dbs_type |
|
||||||
| Field required dbs_type | 74737540052e1641ab88249082085472 | | michelangelo-be.colosa.net | test | testuser | sample | utf8 | mysql connection | 400 | dbs_type |
|
| Field required dbs_server | 74737540052e1641ab88249082085472 | <mys_db_type> | | <mys_db_name> | <mys_db_username> | <mys_db_password> | <mys_db_port> | <mys_db_encode> | mysql connection | 400 | dbs_server |
|
||||||
| Field required dbs_server | 74737540052e1641ab88249082085472 | mysql | | test | testuser | sample | utf8 | mysql connection | 400 | dbs_server |
|
| Field required dbs_database_name | 74737540052e1641ab88249082085472 | <mys_db_type> | <mys_db_server> | | <mys_db_username> | <mys_db_password> | <mys_db_port> | <mys_db_encode> | mysql connection | 400 | dbs_database_name |
|
||||||
| Field required dbs_database_name | 74737540052e1641ab88249082085472 | mysql | michelangelo-be.colosa.net | | testuser | sample | utf8 | mysql connection | 400 | dbs_database_name |
|
| Field required dbs_encode | 74737540052e1641ab88249082085472 | <mys_db_type> | <mys_db_server> | <mys_db_name> | <mys_db_username> | <mys_db_password> | <mys_db_port> | | mysql connection | 400 | dbs_encode |
|
||||||
| Field required dbs_encode | 74737540052e1641ab88249082085472 | mysql | michelangelo-be.colosa.net | test | testuser | sample | | mysql connection | 400 | dbs_encode |
|
| Field required project | | <mys_db_type> | <mys_db_server> | <mys_db_name> | <mys_db_username> | <mys_db_password> | <mys_db_port> | <mys_db_encode> | mysql connection | 400 | prj_uid |
|
||||||
| Field required project | | mysql | michelangelo-be.colosa.net | test | testuser | sample | utf8 | mysql connection | 400 | prj_uid |
|
|
||||||
|
|
||||||
|
|
||||||
Scenario: Test database connection to test with parameter wrong port
|
Scenario Outline: Test database connection to test with parameter wrong port
|
||||||
Given POST this data:
|
Given POST this data:
|
||||||
"""
|
"""
|
||||||
{
|
{
|
||||||
"dbs_type": "mysql",
|
"dbs_type": "<dbs_type>",
|
||||||
"dbs_server": "michelangelo-be.colosa.net",
|
"dbs_server": "<dbs_server>",
|
||||||
"dbs_database_name": "test",
|
"dbs_database_name": "<dbs_database_name>",
|
||||||
"dbs_username": "testuser",
|
"dbs_username": "<dbs_username>",
|
||||||
"dbs_password": "sample",
|
"dbs_password": "<dbs_password>",
|
||||||
"dbs_port": 10000,
|
"dbs_port": <dbs_port>,
|
||||||
"dbs_encode": "utf8",
|
"dbs_encode": "<dbs_encode>",
|
||||||
"dbs_description": "mysql connection"
|
"dbs_description": "<dbs_description>"
|
||||||
}
|
}
|
||||||
"""
|
"""
|
||||||
And I request "project/74737540052e1641ab88249082085472/database-connection"
|
And I request "project/74737540052e1641ab88249082085472/database-connection"
|
||||||
Then the response status code should be 400
|
Then the response status code should be 400
|
||||||
And the response status message should have the following text "port"
|
And the response status message should have the following text "port"
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
| dbs_type | dbs_server | dbs_database_name | dbs_username | dbs_password | dbs_port | dbs_encode | dbs_description |
|
||||||
|
| <mys_db_type> | <mys_db_server> | <mys_db_name> | <mys_db_username> | <mys_db_password> | <mys_db_port> | <mys_db_encode> | <mys_db_description> |
|
||||||
|
| <mys_db_type> | <mys_db_server> | <mys_db_name> | <mys_db_username> | <mys_db_password> | <mys_db_port> | <mys_db_encode> | <mys_db_description> |
|
||||||
@@ -19,7 +19,6 @@ global $config;
|
|||||||
|
|
||||||
class RestContext extends BehatContext
|
class RestContext extends BehatContext
|
||||||
{
|
{
|
||||||
|
|
||||||
private $_startTime = null;
|
private $_startTime = null;
|
||||||
private $_restObject = null;
|
private $_restObject = null;
|
||||||
private $_headers = array();
|
private $_headers = array();
|
||||||
@@ -88,6 +87,52 @@ class RestContext extends BehatContext
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @BeforeScenario @MysqlDbConnection
|
||||||
|
*/
|
||||||
|
public function verifyAllRequiredDataToConnectMysqlDB()
|
||||||
|
{
|
||||||
|
$db_parameters = array(
|
||||||
|
'mys_db_type',
|
||||||
|
'mys_db_server',
|
||||||
|
'mys_db_name',
|
||||||
|
'mys_db_username',
|
||||||
|
'mys_db_password',
|
||||||
|
'mys_db_port',
|
||||||
|
'mys_db_encode',
|
||||||
|
'mys_db_description');
|
||||||
|
|
||||||
|
foreach ($db_parameters as $value) {
|
||||||
|
$param = $this->getParameter($value);
|
||||||
|
if (!isset($param)){
|
||||||
|
throw new PendingException("Parameter ".$value." is not defined or is empty, please review behat.yml file!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @BeforeScenario @SqlServerDbConnection
|
||||||
|
*/
|
||||||
|
public function verifyAllRequiredDataToConnectSqlServerDB()
|
||||||
|
{
|
||||||
|
$db_parameters = array(
|
||||||
|
'sqlsrv_db_type',
|
||||||
|
'sqlsrv_db_server',
|
||||||
|
'sqlsrv_db_name',
|
||||||
|
'sqlsrv_db_username',
|
||||||
|
'sqlsrv_db_password',
|
||||||
|
'sqlsrv_db_port',
|
||||||
|
'sqlsrv_db_encode',
|
||||||
|
'sqlsrv_db_description');
|
||||||
|
|
||||||
|
foreach ($db_parameters as $value) {
|
||||||
|
$param = $this->getParameter($value);
|
||||||
|
if (!isset($param)){
|
||||||
|
throw new PendingException("Parameter ".$value." is not defined or is empty, please review behat.yml file!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ============ json array ===================
|
* ============ json array ===================
|
||||||
* @Given /^that I send (\[[^]]*\])$/
|
* @Given /^that I send (\[[^]]*\])$/
|
||||||
@@ -321,6 +366,7 @@ class RestContext extends BehatContext
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// BACKGROUND STEPS
|
||||||
/**
|
/**
|
||||||
* @Given /^that I have a valid access_token$/
|
* @Given /^that I have a valid access_token$/
|
||||||
*/
|
*/
|
||||||
@@ -998,6 +1044,19 @@ class RestContext extends BehatContext
|
|||||||
*/
|
*/
|
||||||
public function postThisData(PyStringNode $string)
|
public function postThisData(PyStringNode $string)
|
||||||
{
|
{
|
||||||
|
/*
|
||||||
|
* Overwrite the $this->_requestBody = $string; line in order to replace line by line with test data.
|
||||||
|
* */
|
||||||
|
$linesValues = array();
|
||||||
|
foreach ($string->getLines() as $line) {
|
||||||
|
foreach ($this->_parameters as $param => $value) {
|
||||||
|
$line = str_replace('<'.$param.'>', $value, $line);
|
||||||
|
}
|
||||||
|
$linesValues[] = $line;
|
||||||
|
}
|
||||||
|
$string->setLines($linesValues);
|
||||||
|
|
||||||
|
|
||||||
$this->_restObjectMethod = 'post';
|
$this->_restObjectMethod = 'post';
|
||||||
$this->_headers['Content-Type'] = 'application/json; charset=UTF-8';
|
$this->_headers['Content-Type'] = 'application/json; charset=UTF-8';
|
||||||
$this->_requestBody = $string;
|
$this->_requestBody = $string;
|
||||||
@@ -1008,6 +1067,19 @@ class RestContext extends BehatContext
|
|||||||
*/
|
*/
|
||||||
public function putThisData(PyStringNode $string)
|
public function putThisData(PyStringNode $string)
|
||||||
{
|
{
|
||||||
|
/*
|
||||||
|
* Overwrite the $this->_requestBody = $string; line in order to replace line by line with test data.
|
||||||
|
* */
|
||||||
|
$linesValues = array();
|
||||||
|
foreach ($string->getLines() as $line) {
|
||||||
|
foreach ($this->_parameters as $param => $value) {
|
||||||
|
$line = str_replace('<'.$param.'>', $value, $line);
|
||||||
|
}
|
||||||
|
$linesValues[] = $line;
|
||||||
|
}
|
||||||
|
$string->setLines($linesValues);
|
||||||
|
|
||||||
|
|
||||||
$this->_restObjectMethod = 'put';
|
$this->_restObjectMethod = 'put';
|
||||||
$this->_headers['Content-Type'] = 'application/json; charset=UTF-8';
|
$this->_headers['Content-Type'] = 'application/json; charset=UTF-8';
|
||||||
$this->_requestBody = $string;
|
$this->_requestBody = $string;
|
||||||
@@ -1813,7 +1885,6 @@ class RestContext extends BehatContext
|
|||||||
$sessionData->dbconnectionStatus->$dbConnectionId = !$sw_error;
|
$sessionData->dbconnectionStatus->$dbConnectionId = !$sw_error;
|
||||||
file_put_contents("session.data", json_encode($sessionData));
|
file_put_contents("session.data", json_encode($sessionData));
|
||||||
if($sw_error){
|
if($sw_error){
|
||||||
|
|
||||||
throw new PendingException($message);
|
throw new PendingException($message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1828,9 +1899,8 @@ class RestContext extends BehatContext
|
|||||||
$sessionData = new StdClass();
|
$sessionData = new StdClass();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$sessionData = new StdClass();
|
||||||
if(!$sessionData->dbconnectionStatus->$dbConnectionId){
|
if(!$sessionData->dbconnectionStatus->$dbConnectionId){
|
||||||
|
|
||||||
|
|
||||||
throw new PendingException("Skip inactive dbconnection: $dbConnectionId");
|
throw new PendingException("Skip inactive dbconnection: $dbConnectionId");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1150,19 +1150,17 @@ class PMPluginRegistry
|
|||||||
public function setupPlugins ()
|
public function setupPlugins ()
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
|
require_once(PATH_CORE . "methods" . PATH_SEP . "enterprise" . PATH_SEP . "enterprise.php");
|
||||||
|
require_once("class.serverConfiguration.php");
|
||||||
|
|
||||||
$iPlugins = 0;
|
$iPlugins = 0;
|
||||||
require_once ( 'class.serverConfiguration.php' );
|
|
||||||
$oServerConf = & serverConf::getSingleton();
|
$oServerConf = & serverConf::getSingleton();
|
||||||
$oServerConf->addPlugin( SYS_SYS, $this->_aPluginDetails );
|
$oServerConf->addPlugin( SYS_SYS, $this->_aPluginDetails );
|
||||||
foreach ($this->_aPluginDetails as $namespace => $detail) {
|
foreach ($this->_aPluginDetails as $namespace => $detail) {
|
||||||
if (isset( $detail->enabled ) && $detail->enabled) {
|
if (isset( $detail->enabled ) && $detail->enabled) {
|
||||||
if (! empty( $detail->sFilename ) && file_exists( $detail->sFilename )) {
|
if (! empty( $detail->sFilename ) && file_exists( $detail->sFilename )) {
|
||||||
if (strpos( $detail->sFilename, PATH_SEP ) !== false) {
|
$arrayFileInfo = pathinfo($detail->sFilename);
|
||||||
$aux = explode( PATH_SEP, $detail->sFilename );
|
$sFilename = (($detail->sNamespace == "enterprise")? PATH_CORE. "methods" . PATH_SEP . "enterprise" . PATH_SEP : PATH_PLUGINS) . $arrayFileInfo["basename"];
|
||||||
} else {
|
|
||||||
$aux = explode( chr( 92 ), $detail->sFilename );
|
|
||||||
}
|
|
||||||
$sFilename = (($detail->sNamespace == 'enterprise') ? PATH_CORE. 'methods' . PATH_SEP . 'enterprise' . PATH_SEP : PATH_PLUGINS) . $aux[count( $aux ) - 1];
|
|
||||||
if (! file_exists( $sFilename )) {
|
if (! file_exists( $sFilename )) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -1186,7 +1184,6 @@ class PMPluginRegistry
|
|||||||
G::RenderPage( 'publish' );
|
G::RenderPage( 'publish' );
|
||||||
die();
|
die();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user