Merge pull request #1283 from Freika/dev

0.26.7

Author: Freika

.app_version

@@ -1 +1 @@
-0.26.6
+0.26.7

.circleci/config.yml

@@ -7,24 +7,36 @@ orbs:
 jobs:
   test:
     docker:
-      - image: cimg/ruby:3.4.1
+      - image: cimg/ruby:3.4.1-browsers
         environment:
           RAILS_ENV: test
+          CI: true
       - image: cimg/postgres:13.3-postgis
         environment:
           POSTGRES_USER: postgres
           POSTGRES_DB: test_database
           POSTGRES_PASSWORD: mysecretpassword
       - image: redis:7.0
+      - image: selenium/standalone-chrome:latest
+        name: chrome
+        environment:
+          START_XVFB: 'false'
+          JAVA_OPTS: -Dwebdriver.chrome.whitelistedIps=
 
     steps:
       - checkout
+      - browser-tools/install-chrome
+      - browser-tools/install-chromedriver
       - run:
           name: Install Bundler
           command: gem install bundler
       - run:
           name: Bundle Install
           command: bundle install --jobs=4 --retry=3
+      - run:
+          name: Wait for Selenium Chrome
+          command: |
+            dockerize -wait tcp://chrome:4444 -timeout 1m
       - run:
           name: Database Setup
           command: |
@@ -35,6 +47,8 @@ jobs:
           command: bundle exec rspec
       - store_artifacts:
           path: coverage
+      - store_artifacts:
+          path: tmp/capybara
 
 workflows:
   rspec:

.github/workflows/ci.yml

@@ -49,14 +49,33 @@ jobs:
       - name: Install Ruby dependencies
         run: bundle install
 
-      - name: Run tests
+      - name: Run bundler audit
+        run: |
+          gem install bundler-audit
+          bundle audit --update
+
+      - name: Setup database
+        env:
+          RAILS_ENV: test
+          DATABASE_URL: postgres://postgres:postgres@localhost:5432
+          REDIS_URL: redis://localhost:6379/1
+        run: bin/rails db:setup
+
+      - name: Run main tests (excluding system tests)
+        env:
+          RAILS_ENV: test
+          DATABASE_URL: postgres://postgres:postgres@localhost:5432
+          REDIS_URL: redis://localhost:6379/1
+        run: |
+          bundle exec rspec --exclude-pattern "spec/system/**/*_spec.rb" || (cat log/test.log && exit 1)
+
+      - name: Run system tests
         env:
           RAILS_ENV: test
           DATABASE_URL: postgres://postgres:postgres@localhost:5432
           REDIS_URL: redis://localhost:6379/1
         run: |
-          bin/rails db:setup
-          bin/rails spec || (cat log/test.log && exit 1)
+          bundle exec rspec spec/system/ || (cat log/test.log && exit 1)
 
       - name: Keep screenshots from failed system tests
         uses: actions/upload-artifact@v4

CHANGELOG.md

@@ -5,6 +5,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 
+# 0.26.7 - 2025-05-26
+
+## Fixed
+
+- Popups now showing distance in the correct distance unit. #1258
+
+## Added
+
+- Bunch of system tests to cover map interactions.
+
+
 # 0.26.6 - 2025-05-22
 
 ## Added

Gemfile

@@ -49,6 +49,7 @@ gem 'jwt'
 
 group :development, :test do
   gem 'brakeman', require: false
+  gem 'bundler-audit', require: false
   gem 'debug', platforms: %i[mri mingw x64_mingw]
   gem 'dotenv-rails'
   gem 'factory_bot_rails'
@@ -60,7 +61,9 @@ group :development, :test do
 end
 
 group :test do
+  gem 'capybara'
   gem 'fakeredis'
+  gem 'selenium-webdriver'
   gem 'shoulda-matchers'
   gem 'simplecov', require: false
   gem 'super_diff'

Gemfile.lock

@@ -99,12 +99,24 @@ GEM
     bcrypt (3.1.20)
     benchmark (0.4.0)
     bigdecimal (3.1.9)
-    bootsnap (1.18.4)
+    bootsnap (1.18.6)
       msgpack (~> 1.2)
     brakeman (7.0.2)
       racc
     builder (3.3.0)
+    bundler-audit (0.9.2)
+      bundler (>= 1.2.0, < 3)
+      thor (~> 1.0)
     byebug (12.0.0)
+    capybara (3.40.0)
+      addressable
+      matrix
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.11)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (>= 1.5, < 3.0)
+      xpath (~> 3.2)
     chartkick (5.1.5)
     coderay (1.1.3)
     concurrent-ruby (1.3.5)
@@ -132,13 +144,14 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    diff-lcs (1.5.1)
+    diff-lcs (1.6.2)
     docile (1.4.1)
     dotenv (3.1.7)
     dotenv-rails (3.1.7)
       dotenv (= 3.1.7)
       railties (>= 6.1)
-    drb (2.2.1)
+    drb (2.2.3)
+    erb (5.0.1)
     erubi (1.13.1)
     et-orbi (1.2.11)
       tzinfo
@@ -161,8 +174,8 @@ GEM
     gpx (1.2.0)
       nokogiri (~> 1.7)
       rake
-    groupdate (6.5.1)
-      activesupport (>= 7)
+    groupdate (6.6.0)
+      activesupport (>= 7.1)
     hashdiff (1.1.2)
     httparty (0.23.1)
       csv
@@ -205,7 +218,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.24.0)
+    loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -214,11 +227,12 @@ GEM
       net-pop
       net-smtp
     marcel (1.0.4)
+    matrix (0.4.2)
     method_source (1.1.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.8)
+    mini_portile2 (2.8.9)
     minitest (5.25.5)
-    msgpack (1.7.3)
+    msgpack (1.8.0)
     multi_json (1.15.0)
     multi_xml (0.7.1)
       bigdecimal (~> 3.1)
@@ -245,7 +259,7 @@ GEM
       racc (~> 1.4)
     nokogiri (1.18.8-x86_64-linux-gnu)
       racc (~> 1.4)
-    oj (3.16.9)
+    oj (3.16.10)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     optimist (3.2.0)
@@ -272,7 +286,7 @@ GEM
       pry (>= 0.13, < 0.16)
     pry-rails (0.3.11)
       pry (>= 0.13.0)
-    psych (5.2.4)
+    psych (5.2.6)
       date
       stringio
     public_suffix (6.0.1)
@@ -283,7 +297,7 @@ GEM
     raabro (1.4.0)
     racc (1.8.1)
     rack (3.1.15)
-    rack-session (2.1.0)
+    rack-session (2.1.1)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
     rack-test (2.2.0)
@@ -304,7 +318,7 @@ GEM
       activesupport (= 8.0.2)
       bundler (>= 1.15.0)
       railties (= 8.0.2)
-    rails-dom-testing (2.2.0)
+    rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
@@ -321,7 +335,8 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.2.1)
-    rdoc (6.13.1)
+    rdoc (6.14.0)
+      erb
       psych (>= 4.0.0)
     redis (5.4.0)
       redis-client (>= 0.22.0)
@@ -345,21 +360,21 @@ GEM
       rgeo (>= 1.0.0)
     rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
+    rspec-expectations (3.13.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.2)
+    rspec-mocks (3.13.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (7.1.1)
-      actionpack (>= 7.0)
-      activesupport (>= 7.0)
-      railties (>= 7.0)
+    rspec-rails (8.0.0)
+      actionpack (>= 7.2)
+      activesupport (>= 7.2)
+      railties (>= 7.2)
       rspec-core (~> 3.13)
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
-    rspec-support (3.13.2)
+    rspec-support (3.13.3)
     rswag-api (2.16.0)
       activesupport (>= 5.2, < 8.1)
       railties (>= 5.2, < 8.1)
@@ -392,11 +407,18 @@ GEM
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.44.0, < 2.0)
     ruby-progressbar (1.13.0)
+    rubyzip (2.4.1)
     securerandom (0.4.1)
-    sentry-rails (5.23.0)
+    selenium-webdriver (4.33.0)
+      base64 (~> 0.2)
+      logger (~> 1.4)
+      rexml (~> 3.2, >= 3.2.5)
+      rubyzip (>= 1.2.2, < 3.0)
+      websocket (~> 1.0)
+    sentry-rails (5.24.0)
       railties (>= 5.0)
-      sentry-ruby (~> 5.23.0)
-    sentry-ruby (5.23.0)
+      sentry-ruby (~> 5.24.0)
+    sentry-ruby (5.24.0)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
     shoulda-matchers (6.5.0)
@@ -466,11 +488,14 @@ GEM
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.9.1)
+    websocket (1.2.11)
     websocket-driver (0.7.7)
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.7.2)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
+    zeitwerk (2.7.3)
 
 PLATFORMS
   aarch64-linux
@@ -487,6 +512,8 @@ DEPENDENCIES
   aws-sdk-s3 (~> 1.177.0)
   bootsnap
   brakeman
+  bundler-audit
+  capybara
   chartkick
   data_migrate
   database_consistency
@@ -523,6 +550,7 @@ DEPENDENCIES
   rswag-specs
   rswag-ui
   rubocop-rails
+  selenium-webdriver
   sentry-rails
   sentry-ruby
   shoulda-matchers

README.md

@@ -50,6 +50,7 @@ You can track your location with the following apps:
 - 🌍 [Overland](https://dawarich.app/docs/tutorials/track-your-location#overland)
 - 🛰️ [OwnTracks](https://dawarich.app/docs/tutorials/track-your-location#owntracks)
 - 🗺️ [GPSLogger](https://dawarich.app/docs/tutorials/track-your-location#gps-logger)
+- 📱 [PhoneTrack](https://dawarich.app/docs/tutorials/track-your-location#phonetrack)
 - 🏡 [Home Assistant](https://dawarich.app/docs/tutorials/track-your-location#homeassistant)
 
 Simply install one of the supported apps on your device and configure it to send location updates to your Dawarich instance.

app/assets/builds/tailwind.css

@@ -48,7 +48,7 @@ export default class extends BaseController {
     this.fogLinethreshold = parseInt(this.userSettings.fog_of_war_threshold) || 90;
     // Store route opacity as decimal (0-1) internally
     this.routeOpacity = parseFloat(this.userSettings.route_opacity) || 0.6;
-    this.distanceUnit = this.userSettings.distance_unit || "km";
+    this.distanceUnit = this.userSettings.maps?.distance_unit || "km";
     this.pointsRenderingMode = this.userSettings.points_rendering_mode || "raw";
     this.liveMapEnabled = this.userSettings.live_map_enabled || false;
     this.countryCodesMap = countryCodesMap();

app/javascript/controllers/maps_controller.js

@@ -66,6 +66,15 @@ export function formatDate(timestamp, timezone) {
   return date.toLocaleString(locale, { timeZone: timezone });
 }
 
+export function formatSpeed(speedKmh, unit = 'km') {
+  if (unit === 'km') {
+    return `${Math.round(speedKmh)} km/h`;
+  } else {
+    const speedMph = speedKmh * 0.621371; // Convert km/h to mph
+    return `${Math.round(speedMph)} mph`;
+  }
+}
+
 export function haversineDistance(lat1, lon1, lat2, lon2, unit = 'km') {
   // Haversine formula to calculate the distance between two points
   const toRad = (x) => (x * Math.PI) / 180;

app/javascript/maps/helpers.js

@@ -1,5 +1,6 @@
 import { formatDate } from "../maps/helpers";
 import { formatDistance } from "../maps/helpers";
+import { formatSpeed } from "../maps/helpers";
 import { minutesToDaysHoursMinutes } from "../maps/helpers";
 import { haversineDistance } from "../maps/helpers";
 
@@ -224,7 +225,7 @@ export function addHighlightOnHover(polylineGroup, map, polylineCoordinates, use
             <strong>End:</strong> ${lastTimestamp}<br>
             <strong>Duration:</strong> ${timeOnRoute}<br>
             <strong>Total Distance:</strong> ${formatDistance(totalDistance, distanceUnit)}<br>
-            <strong>Current Speed:</strong> ${Math.round(speed)} km/h
+            <strong>Current Speed:</strong> ${formatSpeed(speed, distanceUnit)}
         `;
 
         if (hoverPopup) {
@@ -318,7 +319,7 @@ export function addHighlightOnHover(polylineGroup, map, polylineCoordinates, use
       <strong>End:</strong> ${lastTimestamp}<br>
       <strong>Duration:</strong> ${timeOnRoute}<br>
       <strong>Total Distance:</strong> ${formatDistance(totalDistance, distanceUnit)}<br>
-      <strong>Current Speed:</strong> ${Math.round(clickedLayer.options.speed || 0)} km/h
+      <strong>Current Speed:</strong> ${formatSpeed(clickedLayer.options.speed || 0, distanceUnit)}
     `;
 
     if (hoverPopup) {