Skip to content
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

Jump to bottom

[full-ci] Bump web to v4.5.0 #2780

Merged
merged 8 commits into from
Nov 17, 2021
Merged

[full-ci] Bump web to v4.5.0 #2780

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f13ccb1
Bump web to v4.5.0
pascalwengerter Nov 16, 2021
c7cdccf
Install web acceptance test dependencies for web, accounts, settins
pascalwengerter Nov 16, 2021
f549d71
Reduce copying of web test code
pascalwengerter Nov 17, 2021
e1426da
fix path
individual-it Nov 17, 2021
0f07a0b
fix path part 2
individual-it Nov 17, 2021
4ccc65f
fix path part 3
individual-it Nov 17, 2021
794fd16
simplify drone starlark
individual-it Nov 17, 2021
d2395f5
add comments about install steps and remove skeleton
wkloucek Nov 17, 2021
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
6 changes: 3 additions & 3 deletions settings/nightwatch.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ const path = require('path')
const WEB_PATH = process.env.WEB_PATH
const TEST_INFRA_DIRECTORY = process.env.TEST_INFRA_DIRECTORY

const config = require(path.join(WEB_PATH, 'tests/acceptance/nightwatch.conf.js'))
const config = require(path.join(TEST_INFRA_DIRECTORY, 'nightwatch.conf.js'))

config.page_objects_path = [TEST_INFRA_DIRECTORY + '/acceptance/pageObjects', 'ui/tests/acceptance/pageobjects']
config.custom_commands_path = TEST_INFRA_DIRECTORY + '/acceptance/customCommands'
config.page_objects_path = [TEST_INFRA_DIRECTORY + '/pageObjects', 'ui/tests/acceptance/pageobjects']
config.custom_commands_path = TEST_INFRA_DIRECTORY + '/customCommands'

module.exports = config
3 changes: 2 additions & 1 deletion settings/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"license": "Apache-2.0",
"author": "ownCloud GmbH <[email protected]>",
"scripts": {
"acceptance-tests": "cucumber-js --retry 1 --require-module @babel/register --require-module @babel/polyfill --require ${TEST_INFRA_DIRECTORY}/acceptance/setup.js --require ui/tests/acceptance/stepDefinitions --require ${TEST_INFRA_DIRECTORY}/acceptance/stepDefinitions --format @cucumber/pretty-formatter -t \"${TEST_TAGS:-not @skip and not @skipOnOC10}\"",
"acceptance-tests": "echo ${TEST_INFRA_DIRECTORY}/stepDefinitions; cucumber-js --retry 1 --require-module @babel/register --require-module @babel/polyfill --require ${TEST_INFRA_DIRECTORY}/setup.js --require ui/tests/acceptance/stepDefinitions --require ${TEST_INFRA_DIRECTORY}/stepDefinitions --format @cucumber/pretty-formatter -t \"${TEST_TAGS:-not @skip and not @skipOnOC10}\"",
"build": "rollup -c",
"generate-api": "node node_modules/swagger-vue-generator/bin/generate-api.js --package-version v0 --source pkg/proto/v0/settings.swagger.json --moduleName settings --destination ui/client/settings/index.js",
"lint": "eslint ui/**/*.vue ui/**/*.js --color --global requirejs --global require",
Expand Down Expand Up @@ -45,6 +45,7 @@
"@rollup/plugin-commonjs": "^17.1.0",
"@rollup/plugin-json": "^4.0.1",
"@rollup/plugin-replace": "^2.4.2",
"chromedriver": "^93.0.1",
"archiver": "^5.3.0",
"cross-env": "^7.0.3",
"easygettext": "^2.7.0",
Expand Down
10 changes: 6 additions & 4 deletions settings/ui/tests/run-acceptance-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ then
exit 1
fi

trap clean_up SIGHUP SIGINT SIGTERM
#trap clean_up SIGHUP SIGINT SIGTERM

if [ -z "$TEST_INFRA_DIRECTORY" ]
then
cleanup=true
testFolder=$(mktemp -d -p .)
printf "creating folder $testFolder for Test infrastructure setup\n\n"
export TEST_INFRA_DIRECTORY=$testFolder/tests
export TEST_INFRA_DIRECTORY=$(realpath $testFolder)
fi

clean_up() {
Expand All @@ -40,8 +40,10 @@ clean_up() {

trap clean_up SIGHUP SIGINT SIGTERM EXIT

cp -r "$WEB_PATH"/tests/acceptance/stepDefinitions "$testFolder"
cp "$WEB_PATH"/tests/acceptance/setup.js "$testFolder"
cp -r "$WEB_PATH"/tests/acceptance/* "$testFolder"
rm -r $testFolder/node_modules
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we do cp -r !(node_modules) "$WEB_PATH"/tests/acceptance/* or the likes instead of copying and removing those gazillion files? :)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, and also I think we don't need one yarn install in drone


yarn install --immutable

export SERVER_HOST=${SERVER_HOST:-https://localhost:9200}
export BACKEND_HOST=${BACKEND_HOST:-https://localhost:9200}
Expand Down
Loading