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

[stable21] Use npm ci when running JS tests #30583

Merged
merged 6 commits into from
Jan 11, 2022
Merged

[stable21] Use npm ci when running JS tests #30583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3fd15e6
Use npm ci when running JS tests
PVince81 Jan 10, 2022
a0fefaa
Update node deps for JS tests
PVince81 Jan 10, 2022
9fb5d00
Make chokidar happy with fsevents
PVince81 Jan 10, 2022
9b5c5d0
Fix JS tests after test lib updates
PVince81 Jan 10, 2022
eed0b7d
Recompile JS
PVince81 Jan 10, 2022
dcb1219
Update package-lock in build dir
PVince81 Jan 11, 2022
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
2 changes: 1 addition & 1 deletion apps/files/js/dist/main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/files/js/dist/main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/files/js/dist/personal-settings.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/files/js/dist/personal-settings.js.map
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions apps/files/src/files-app-settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ Object.assign(window.OCA.Files, { Settings: new Settings() })
Object.assign(window.OCA.Files.Settings, { Setting })

window.addEventListener('DOMContentLoaded', function() {
if (window.TESTING) {
return
}
// Init Vue app
// eslint-disable-next-line
new Vue({
Expand Down
6 changes: 4 additions & 2 deletions apps/files/src/main-personal-settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,7 @@ __webpack_public_path__ = generateFilePath('files', '', 'js/')

Vue.prototype.t = t

const View = Vue.extend(PersonalSettings)
new View().$mount('#files-personal-settings')
if (!window.TESTING) {
const View = Vue.extend(PersonalSettings)
new View().$mount('#files-personal-settings')
}
4 changes: 3 additions & 1 deletion apps/systemtags/js/admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,8 @@
})();

window.addEventListener('DOMContentLoaded', function() {
OCA.SystemTags.Admin.init();
if (!window.TESTING) {
OCA.SystemTags.Admin.init();
}
});

2 changes: 1 addition & 1 deletion autotest-js.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ then
fi

# update/install test packages
mkdir -p "$PREFIX" && $NPM install --link --prefix "$PREFIX" || exit 3
mkdir -p "$PREFIX" && $NPM ci --link --prefix "$PREFIX" || exit 3

# create scss test
mkdir -p tests/css
Expand Down
Loading