Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
2746b36286 | ||
|
ab8ad38b85 | ||
|
d5db8f1c55 |
@@ -180,3 +180,6 @@
|
||||
[1.17.3]
|
||||
* Update traccar to 6.7.3
|
||||
|
||||
[1.18.0]
|
||||
* Update traccar to 6.8.1
|
||||
|
||||
|
@@ -5,8 +5,8 @@
|
||||
"description": "file://DESCRIPTION.md",
|
||||
"changelog": "file://CHANGELOG.md",
|
||||
"tagline": "Modern GPS Tracking Platform",
|
||||
"version": "1.17.3",
|
||||
"upstreamVersion": "6.7.3",
|
||||
"version": "1.18.0",
|
||||
"upstreamVersion": "6.8.1",
|
||||
"minBoxVersion": "8.1.0",
|
||||
"memoryLimit": 1073741824,
|
||||
"healthCheckPath": "/",
|
||||
|
@@ -4,7 +4,7 @@ RUN mkdir -p /app/code
|
||||
WORKDIR /app/code
|
||||
|
||||
# renovate: datasource=github-releases depName=traccar/traccar versioning=regex:^(?<major>\d+)\.(?<minor>\d+)\.?(?<patch>\d+)?$ extractVersion=^v(?<version>.+)$
|
||||
ARG TRACCAR_VERSION=6.7.3
|
||||
ARG TRACCAR_VERSION=6.8.1
|
||||
|
||||
RUN wget https://github.com/traccar/traccar/releases/download/v${TRACCAR_VERSION}/traccar-linux-64-${TRACCAR_VERSION}.zip -O traccar.zip && \
|
||||
unzip traccar.zip && \
|
||||
|
61
test/package-lock.json
generated
61
test/package-lock.json
generated
@@ -9,12 +9,12 @@
|
||||
"version": "1.0.0",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"chromedriver": "^137.0.3"
|
||||
"chromedriver": "^138.0.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"expect.js": "^0.3.1",
|
||||
"mocha": "^11.6.0",
|
||||
"selenium-webdriver": "^4.33.0"
|
||||
"mocha": "^11.7.1",
|
||||
"selenium-webdriver": "^4.34.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@bazel/runfiles": {
|
||||
@@ -326,9 +326,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/chromedriver": {
|
||||
"version": "137.0.3",
|
||||
"resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-137.0.3.tgz",
|
||||
"integrity": "sha512-ceBxOxaXl/3ddvxZicgASpL8HfxmUK/q/VI3STcyl0t+SvgydNqXQO1XWwqUIA/tMfREpUunumQvwH7r6hdT0Q==",
|
||||
"version": "138.0.1",
|
||||
"resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-138.0.1.tgz",
|
||||
"integrity": "sha512-QS/Z1qB2OpKsPUlJjkfKmpf9lGw6ObB0dX5+dP3M0gdtbu80TUnS+EjXbtu6YkbMfr2/Qt8IfOONrawNW1GwhA==",
|
||||
"hasInstallScript": true,
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
@@ -1049,9 +1049,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/mocha": {
|
||||
"version": "11.6.0",
|
||||
"resolved": "https://registry.npmjs.org/mocha/-/mocha-11.6.0.tgz",
|
||||
"integrity": "sha512-i0JVb+OUBqw63X/1pC3jCyJsqYisgxySBbsQa8TKvefpA1oEnw7JXxXnftfMHRsw7bEEVGRtVlHcDYXBa7FzVw==",
|
||||
"version": "11.7.1",
|
||||
"resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.1.tgz",
|
||||
"integrity": "sha512-5EK+Cty6KheMS/YLPPMJC64g5V61gIR25KsRItHw6x4hEKT6Njp1n9LOlH4gpevuwMVS66SXaBBpg+RWZkza4A==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
@@ -1352,9 +1352,9 @@
|
||||
]
|
||||
},
|
||||
"node_modules/selenium-webdriver": {
|
||||
"version": "4.33.0",
|
||||
"resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.33.0.tgz",
|
||||
"integrity": "sha512-5vRhk4iI0B9nYbEitfnCjPDXBfG6o9DNhj5DG2355eQo8idETknhj1tigqqlkHsGephSZwLZqEm/d+3e1stGUA==",
|
||||
"version": "4.34.0",
|
||||
"resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.34.0.tgz",
|
||||
"integrity": "sha512-zGfQFcsASAv3KrYzYh+iw4fFqB7iZAgHW7BU6rRz7isK1i1X4x3LvjmZad4bUUgHDwTnAhlqTzDh21byB+zHMg==",
|
||||
"dev": true,
|
||||
"funding": [
|
||||
{
|
||||
@@ -1371,10 +1371,10 @@
|
||||
"@bazel/runfiles": "^6.3.1",
|
||||
"jszip": "^3.10.1",
|
||||
"tmp": "^0.2.3",
|
||||
"ws": "^8.18.0"
|
||||
"ws": "^8.18.2"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 18.20.5"
|
||||
"node": ">= 20.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/serialize-javascript": {
|
||||
@@ -1694,10 +1694,11 @@
|
||||
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
|
||||
},
|
||||
"node_modules/ws": {
|
||||
"version": "8.18.0",
|
||||
"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
|
||||
"integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
|
||||
"version": "8.18.3",
|
||||
"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
|
||||
"integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=10.0.0"
|
||||
},
|
||||
@@ -2014,9 +2015,9 @@
|
||||
}
|
||||
},
|
||||
"chromedriver": {
|
||||
"version": "137.0.3",
|
||||
"resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-137.0.3.tgz",
|
||||
"integrity": "sha512-ceBxOxaXl/3ddvxZicgASpL8HfxmUK/q/VI3STcyl0t+SvgydNqXQO1XWwqUIA/tMfREpUunumQvwH7r6hdT0Q==",
|
||||
"version": "138.0.1",
|
||||
"resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-138.0.1.tgz",
|
||||
"integrity": "sha512-QS/Z1qB2OpKsPUlJjkfKmpf9lGw6ObB0dX5+dP3M0gdtbu80TUnS+EjXbtu6YkbMfr2/Qt8IfOONrawNW1GwhA==",
|
||||
"requires": {
|
||||
"@testim/chrome-version": "^1.1.4",
|
||||
"axios": "^1.7.4",
|
||||
@@ -2514,9 +2515,9 @@
|
||||
"dev": true
|
||||
},
|
||||
"mocha": {
|
||||
"version": "11.6.0",
|
||||
"resolved": "https://registry.npmjs.org/mocha/-/mocha-11.6.0.tgz",
|
||||
"integrity": "sha512-i0JVb+OUBqw63X/1pC3jCyJsqYisgxySBbsQa8TKvefpA1oEnw7JXxXnftfMHRsw7bEEVGRtVlHcDYXBa7FzVw==",
|
||||
"version": "11.7.1",
|
||||
"resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.1.tgz",
|
||||
"integrity": "sha512-5EK+Cty6KheMS/YLPPMJC64g5V61gIR25KsRItHw6x4hEKT6Njp1n9LOlH4gpevuwMVS66SXaBBpg+RWZkza4A==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"browser-stdout": "^1.3.1",
|
||||
@@ -2748,15 +2749,15 @@
|
||||
"dev": true
|
||||
},
|
||||
"selenium-webdriver": {
|
||||
"version": "4.33.0",
|
||||
"resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.33.0.tgz",
|
||||
"integrity": "sha512-5vRhk4iI0B9nYbEitfnCjPDXBfG6o9DNhj5DG2355eQo8idETknhj1tigqqlkHsGephSZwLZqEm/d+3e1stGUA==",
|
||||
"version": "4.34.0",
|
||||
"resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.34.0.tgz",
|
||||
"integrity": "sha512-zGfQFcsASAv3KrYzYh+iw4fFqB7iZAgHW7BU6rRz7isK1i1X4x3LvjmZad4bUUgHDwTnAhlqTzDh21byB+zHMg==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"@bazel/runfiles": "^6.3.1",
|
||||
"jszip": "^3.10.1",
|
||||
"tmp": "^0.2.3",
|
||||
"ws": "^8.18.0"
|
||||
"ws": "^8.18.2"
|
||||
}
|
||||
},
|
||||
"serialize-javascript": {
|
||||
@@ -2986,9 +2987,9 @@
|
||||
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
|
||||
},
|
||||
"ws": {
|
||||
"version": "8.18.0",
|
||||
"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
|
||||
"integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
|
||||
"version": "8.18.3",
|
||||
"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
|
||||
"integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
|
@@ -10,10 +10,10 @@
|
||||
"license": "ISC",
|
||||
"devDependencies": {
|
||||
"expect.js": "^0.3.1",
|
||||
"mocha": "^11.6.0",
|
||||
"selenium-webdriver": "^4.33.0"
|
||||
"mocha": "^11.7.1",
|
||||
"selenium-webdriver": "^4.34.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"chromedriver": "^137.0.3"
|
||||
"chromedriver": "^138.0.1"
|
||||
}
|
||||
}
|
||||
|
@@ -111,9 +111,9 @@ describe('Application life cycle test', function () {
|
||||
|
||||
async function addDevice() {
|
||||
await browser.get(`https://${app.fqdn}/settings/device`);
|
||||
await waitForElement(By.xpath('//input[@id=":r3:" or @id="«r8»"]'));
|
||||
await browser.findElement(By.xpath('//input[@id=":r3:" or @id="«r8»"]')).sendKeys(DEVICE_NAME);
|
||||
await browser.findElement(By.xpath('//input[@id=":r4:" or @id="«r9»"]')).sendKeys(DEVICE_IDENTIFIER);
|
||||
await waitForElement(By.xpath('(//input[contains(@id, "«r")])[1]'));
|
||||
await browser.findElement(By.xpath('(//input[contains(@id, "«r")])[1]')).sendKeys(DEVICE_NAME);
|
||||
await browser.findElement(By.xpath('(//input[contains(@id, "«r")])[2]')).sendKeys(DEVICE_IDENTIFIER);
|
||||
await browser.findElement(By.xpath('//button[text()="Save"]')).click();
|
||||
await waitForElement(By.xpath(`//span[text()="${DEVICE_NAME}"]`));
|
||||
}
|
||||
|
Reference in New Issue
Block a user