Skip to content

Setup for ui tests #27860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
individual-it merged 5 commits into from
May 18, 2017
Merged

Setup for ui tests #27860

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7ce5d12
Add skeleton files for UI testing
May 11, 2017
043d674
Revised feature structure for UI testing
May 11, 2017
20365e4
Merge branch 'master' into setup-for-ui-tests
phil-davis May 12, 2017
11ca7e9
use preseedconfig to set lang & skeleton and not autoconfig
individual-it May 12, 2017
e64165f
Merge remote-tracking branch 'origin/master' into setup-for-ui-tests
phil-davis May 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use preseedconfig to set lang & skeleton and not autoconfig 
autoconfig does not work for this settings
  • Loading branch information
@individual-it
individual-it committed May 12, 2017
commit 11ca7e97b0363861d118bfcae738c55afe43a886
5 changes: 5 additions & 0 deletions tests/preseed-config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
'writable' => true,
],
],
'default_language' => 'en',
];

if (is_dir(OC::$SERVERROOT.'/apps2')) {
Expand All @@ -21,3 +22,7 @@
if (substr(strtolower(PHP_OS), 0, 3) === 'win') {
$CONFIG['openssl'] = ['config' => OC::$SERVERROOT . '/tests/data/openssl.cnf'];
}

if (getenv("TC") === "selenium") {
$CONFIG['skeletondirectory'] = OC::$SERVERROOT . '/tests/ui/skeleton';
}
14 changes: 0 additions & 14 deletions tests/travis/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,6 @@ fi

# use tmpfs for datadir - should speedup unit test execution
DATADIR=$BASEDIR/data-autotest
if [ '$TC' = 'selenium' ]
then
SKELETON_SETTING='"skeletondirectory"=> "'$BASEDIR'/ui/skeleton",'
else
SKELETON_SETTING=""
fi

echo "Using database $DATABASENAME"

Expand All @@ -56,13 +50,11 @@ cat > ./tests/autoconfig-sqlite.php <<DELIM
0 => 'localhost',
1 => '$SRV_HOST_NAME',
),
'default_language' => 'en',
'dbtype' => 'sqlite',
'dbtableprefix' => 'oc_',
'adminlogin' => '$ADMINLOGIN',
'adminpass' => 'admin',
'directory' => '$DATADIR',
$SKELETON_SETTING
);
DELIM

Expand All @@ -75,7 +67,6 @@ cat > ./tests/autoconfig-mysql.php <<DELIM
0 => 'localhost',
1 => '$SRV_HOST_NAME',
),
'default_language' => 'en',
'dbtype' => 'mysql',
'dbtableprefix' => 'oc_',
'adminlogin' => '$ADMINLOGIN',
Expand All @@ -85,7 +76,6 @@ cat > ./tests/autoconfig-mysql.php <<DELIM
'dbname' => '$DATABASENAME',
'dbhost' => 'localhost',
'dbpass' => 'owncloud',
$SKELETON_SETTING
);
DELIM

Expand All @@ -98,7 +88,6 @@ cat > ./tests/autoconfig-pgsql.php <<DELIM
0 => 'localhost',
1 => '$SRV_HOST_NAME',
),
'default_language' => 'en',
'dbtype' => 'pgsql',
'dbtableprefix' => 'oc_',
'adminlogin' => '$ADMINLOGIN',
Expand All @@ -108,7 +97,6 @@ cat > ./tests/autoconfig-pgsql.php <<DELIM
'dbname' => '$DATABASENAME',
'dbhost' => 'localhost',
'dbpass' => '',
$SKELETON_SETTING
);
DELIM

Expand All @@ -121,7 +109,6 @@ cat > ./tests/autoconfig-oracle.php <<DELIM
0 => 'localhost',
1 => '$SRV_HOST_NAME',
),
'default_language' => 'en',
'dbtype' => 'oci',
'dbtableprefix' => 'oc_',
'adminlogin' => '$ADMINLOGIN',
Expand All @@ -132,7 +119,6 @@ cat > ./tests/autoconfig-oracle.php <<DELIM
'dbhost' => 'localhost',
'dbpass' => 'owncloud',
'loglevel' => 0,
$SKELETON_SETTING
);
DELIM

Expand Down