Merge branch 'dev' of https://github.com/anusii/solidpod into av/327_share_resources_with_inheritance

Author: anushkavidanage

.github/ISSUE_TEMPLATE/bug_report.md

@@ -54,4 +54,6 @@ Flutter Version:
 
 Checklist for closing the issue:
 
-- [ ] All tests pass
+- [ ] `make test`
+- [ ] `make qtest`
+- [ ] [Task specific requirements.]

.github/pull_request_template.md

@@ -2,40 +2,53 @@
 
 ## What issue does this PR address
 
-- [A one line description of this PR]
+- [Description]
 
-- Link to associated issue: #
+## Associated Issue
+
+- This PR relates to issue #
+
+## Type of Change
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] This change requires a documentation update
+
+## How Has This Been Tested?
+
+Please describe the tests that you ran to verify your changes.
 
 ## Checklist
 
 Complete the check-list below to ensure your branch is ready for PR.
 
-Flutter Style Guide: https://survivor.togaware.com/gnulinux/flutter-style.html
-
-- [ ] Screenshots included in linked issue
-- [ ] Changes adhere to the team style and coding guideline
-- [ ] No confidential information
-- [ ] No duplicated content
-- [ ] No lint check errors related to your changes (`make prep` or `flutter analyze lib`)
-- [ ] Pre-exisiting lint errors noted: [HERE]
-- [ ] Tested on at least one device
-  - [ ] Android Phone
-  - [ ] Android Emulator
-  - [ ] Chrome on Android
-  - [ ] Chrome
+- [ ] Screenshots included in linked issue #
+- [ ] Changes adhere to the [style and coding guidelines](https://survivor.togaware.com/gnulinux/flutter-style.html)
+- [ ] I have performed a self-review of my code
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the documentation
+- [ ] Any dependent changes have been merged and published in downstream modules
+- [ ] The update contains no confidential information
+- [ ] The update has no duplicated content
+- [ ] No lint check errors are related to these changes (`make prep` or `flutter analyze lib`)
+- [ ] Integration test `dart test` output or screenshot included in issue #
+- [ ] I tested the PR on these devices:
+  - [ ] Android
   - [ ] iOS
   - [ ] Linux
   - [ ] MacOS
   - [ ] Windows
-- [ ] Added 2 reviewers (or 1 for private repositories then they add another)
+  - [ ] Web
+- [ ] I have identified reviewers
+- [ ] The PR has been approved by reviewers
 
 ## Finalising
 
-Once PR discussion is complete and 2 reviewers have approved:
+Once PR discussion is complete and reviewers have approved:
 
-- [ ] Merge dev into the branch
+- [ ] Merge dev into the this branch
 - [ ] Resolve any conflicts
-- [ ] Add one line summary into CHANGELOG.md
-- [ ] Bump appropriate version number in pubspec.yaml
-- [ ] Push to git repository and review
-- [ ] Merge PR into dev
+- [ ] Add a one line summary into the CHANGELOG.md
+- [ ] Push to the git repository and review
+- [ ] Merge the PR into dev

.github/workflows/ci.yaml

@@ -13,7 +13,7 @@ on:
     types: [opened, reopened, synchronize]
 
 env:
-  FLUTTER_VERSION: '3.35.5'
+  FLUTTER_VERSION: '3.35.6'
 
 jobs:
 
@@ -131,11 +131,6 @@ jobs:
     if: github.event.repository.private == false
     steps:
       - uses: actions/checkout@v4
-      - uses: subosito/flutter-action@v2
-        with:
-          channel: 'stable'
-          flutter-version: ${{env.FLUTTER_VERSION}}
-      - run: flutter pub get
       - name: Check copyright headers
         run: |
           # Find Dart files without proper copyright headers, excluding generated files
@@ -156,3 +151,42 @@ jobs:
           else
             echo "✅ All non-generated Dart files have copyright headers"
           fi
+
+  # 20251017 gjw The usual command for running the integration tests
+  # is `flutter test interaction_test` and each `*_test.dart`  is
+  # run. However for our testing of apps using solidui we need to
+  # authenticate through an external browser login. The usual `flutter
+  # test` will not properly authenticate. Instead, we should run `make
+  # qtest.all` to run the tests. This action
+
+  test_enforcement:
+    runs-on: ubuntu-latest
+    if: github.event.repository.private == false
+    steps:
+      - uses: actions/checkout@v4
+      - name: Check for batch test commands
+        run: |
+          # Check for disallowed "flutter test integration_test/" usage in scripts/workflows
+          # Exclude comments and this CI check itself
+          batch_test_found=$(grep -r "flutter test integration_test" \
+            .github/workflows/ \
+            support/ \
+            scripts/ \
+            Makefile 2>/dev/null | \
+            grep -v "# Check for disallowed" | \
+            grep -v "batch_test_found=" | \
+            grep -v "echo.*flutter test integration_test/" || true)
+          if [ -n "$batch_test_found" ]; then
+            echo "❌ Found disallowed batch test command 'flutter test integration_test/'"
+            echo ""
+            echo "Found in:"
+            echo "$batch_test_found"
+            echo ""
+            echo "⚠️  Batch testing fails on desktop due to Flutter framework limitations."
+            echo "✅ Use 'make qtest' instead - it runs tests individually."
+            echo ""
+            echo "See docs/TESTING_GUIDE.md for details."
+            exit 1
+          else
+            echo "✅ No batch test commands found - using recommended 'make qtest' approach"
+          fi

.gitignore

@@ -11,6 +11,8 @@ ARCHIVE
 ignore
 pubspec.yaml.*
 
+qtest_*.txt
+
 installers/*.apk
 installers/*.exe
 installers/*.snap
@@ -21,6 +23,26 @@ installers/*-windows.zip
 
 .Rhistory
 
+# Puppeteer browser cache used in testing solidui apps
+
+.local-chrome/
+
+# Note: test_credentials.json and auth_tokens.json can be committed
+# for CI/CD as baseline/templates that are "stale" tokens that get
+# auto-regenerated when tests are run.  These are test-only
+# credentials for a dev POD server, not production.
+#
+# Because the files are already in the repo we need to tell git to
+# skip these files from the work tree so local chenges don't get committed
+#
+# git update-index --skip-worktree integration_test/fixtures/auth_tokens.json integration_test/fixtures/complete_auth_data.json
+
+# Integration test auth data (contains sensitive tokens)
+
+#integration/fixtures/auth_tokens.json
+#integration/fixtures/complete_auth_data.json
+#integration/fixtures/test_credentials.json
+
 ########################################################################
 # From https://github.com/flutter/flutter/blob/master/.gitignore
 # Combined with the github flutter .gitignore

Makefile

@@ -2,7 +2,7 @@
 #
 # Generic Makefile
 #
-# Time-stamp: <Tuesday 2025-10-07 14:14:43 +1100 Graham Williams>
+# Time-stamp: <Friday 2025-10-17 10:13:43 +1100 Graham Williams>
 #
 # Copyright (c) Graham.Williams@togaware.com
 #
@@ -124,6 +124,9 @@ deb:
 	(cd installers; make $@)
 	rsync -avzh installers/$(APP)_$(VER)_amd64.deb $(REPO):$(RLOC)$(APP)_amd64.deb
 	ssh $(REPO) chmod a+r $(RLOC)$(APP)_amd64.deb
+	wget $(DWLD)/$(APP)_amd64.deb -O $(APP)_amd64.deb
+	wajig install $(APP)_amd64.deb
+	rm -f $(APP)_amd64.deb
 	mv -f installers/$(APP)_*.deb installers/ARCHIVE/
 
 dinstall:

analysis_options.yaml

@@ -20,6 +20,7 @@ linter:
     prefer_single_quotes: true
     require_trailing_commas: true
     directives_ordering: false
+    prefer_const_constructors: true
 
 # Identify directories to ignore.
 

example/lib/constants/app.dart

@@ -6,7 +6,7 @@
 ///
 /// Licensed under the GNU General Public License, Version 3 (the "License").
 ///
-/// License: https://www.gnu.org/licenses/gpl-3.0.en.html.
+/// License: https://opensource.org/license/gpl-3-0.
 //
 // This program is free software: you can redistribute it and/or modify it under
 // the terms of the GNU General Public License as published by the Free Software
@@ -19,7 +19,7 @@
 // details.
 //
 // You should have received a copy of the GNU General Public License along with
-// this program.  If not, see <https://www.gnu.org/licenses/>.
+// this program.  If not, see <https://opensource.org/license/gpl-3-0>.
 ///
 /// Authors: Graham Williams
 

example/lib/dialogs/about.dart

@@ -6,7 +6,7 @@
 ///
 /// Licensed under the GNU General Public License, Version 3 (the "License").
 ///
-/// License: https://www.gnu.org/licenses/gpl-3.0.en.html.
+/// License: https://opensource.org/license/gpl-3-0.
 //
 // This program is free software: you can redistribute it and/or modify it under
 // the terms of the GNU General Public License as published by the Free Software
@@ -19,7 +19,7 @@
 // details.
 //
 // You should have received a copy of the GNU General Public License along with
-// this program.  If not, see <https://www.gnu.org/licenses/>.
+// this program.  If not, see <https://opensource.org/license/gpl-3-0>.
 ///
 /// Authors: Kevin Wang
 

example/lib/dialogs/alert.dart

@@ -4,7 +4,7 @@
 ///
 /// Licensed under the GNU General Public License, Version 3 (the "License").
 ///
-/// License: https://www.gnu.org/licenses/gpl-3.0.en.html.
+/// License: https://opensource.org/license/gpl-3-0.
 //
 // This program is free software: you can redistribute it and/or modify it under
 // the terms of the GNU General Public License as published by the Free Software
@@ -17,7 +17,7 @@
 // details.
 //
 // You should have received a copy of the GNU General Public License along with
-// this program.  If not, see <https://www.gnu.org/licenses/>.
+// this program.  If not, see <https://opensource.org/license/gpl-3-0>.
 ///
 /// Authors: Dawei Chen
 

example/lib/features/edit_keyvalue.dart

@@ -6,7 +6,7 @@
 ///
 /// Licensed under the GNU General Public License, Version 3 (the "License").
 ///
-/// License: https://www.gnu.org/licenses/gpl-3.0.en.html.
+/// License: https://opensource.org/license/gpl-3-0.
 //
 // This program is free software: you can redistribute it and/or modify it under
 // the terms of the GNU General Public License as published by the Free Software
@@ -19,7 +19,7 @@
 // details.
 //
 // You should have received a copy of the GNU General Public License along with
-// this program.  If not, see <https://www.gnu.org/licenses/>.
+// this program.  If not, see <https://opensource.org/license/gpl-3-0>.
 ///
 /// Authors: Dawei Chen