Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Install dependencies and run tests
run: |
box install
box server start cfengine=lucee@6 port=8080
box server start cfengine=lucee@6 port=8080 jvmArgs="-Duser.timezone=America/Vancouver"
box testbox run directory=tests.testbox
box server stop

Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
- name: Install dependencies and run tests
run: |
box install
box server start cfengine=adobe@2018 port=8080
box server start cfengine=adobe@2018 port=8080 jvmArgs="-Duser.timezone=America/Vancouver"
box testbox run directory=tests.testbox
box server stop

Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
- name: Install dependencies and run tests
run: |
box install
box server start cfengine=adobe@2021 port=8080
box server start cfengine=adobe@2021 port=8080 jvmArgs="-Duser.timezone=America/Vancouver"
box testbox run directory=tests.testbox
box server stop

Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
- name: Install dependencies and run tests
run: |
box install
box server start cfengine=adobe@2023 port=8080
box server start cfengine=adobe@2023 port=8080 jvmArgs="-Duser.timezone=America/Vancouver"
box testbox run directory=tests.testbox
box server stop

Expand Down Expand Up @@ -163,6 +163,6 @@ jobs:
- name: Install dependencies and run tests
run: |
box install
box server start cfengine=adobe@2025 port=8080
box server start cfengine=adobe@2025 port=8080 jvmArgs="-Duser.timezone=America/Vancouver"
box testbox run directory=tests.testbox
box server stop
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
tests/results/output.txt
tests/results/testbox.properties
/tests/results/output.txt
/tests/results/testbox.properties

# TestBox (dev dependency, installed per project)
testbox/
/testbox/

# CommandBox server config (user-specific)
server.json
2 changes: 1 addition & 1 deletion box.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "momentcfc",
"version": "1.1.17",
"version": "1.16.3",
"author": "Adam Tuttle",
"location": "https://github.com/atuttle/momentcfc",
"homepage": "https://github.com/atuttle/momentcfc",
Expand Down
2 changes: 1 addition & 1 deletion moment.cfc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
MOMENT.CFC v1.1.17
MOMENT.CFC v1.16.3
-------------------
Inspired by (but not a strict port of) moment.js: http://momentjs.com/
With help from: @seancorfield, @ryanguill
Expand Down
1 change: 1 addition & 0 deletions tests/run-local-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ set -e # Exit on error
cd "$(git rev-parse --show-toplevel)"

CONFIGS=(
"tests/server-lucee5-java11.json"
"tests/server-lucee6-java21.json"
"tests/server-acf2018-java11.json"
"tests/server-acf2021-java11.json"
Expand Down
6 changes: 4 additions & 2 deletions tests/server-acf2018-java11.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"name":"momentcfc-acf2018-java11",
"app":{
"cfengine":"adobe@2018"
"cfengine":"adobe@2018",
"timezone": "America/Vancouver"
},
"jvm":{
"javaVersion":"openjdk11"
"javaVersion":"openjdk11",
"jvmArgs":"-Duser.timezone=America/Vancouver"
},
"web":{
"webroot":"../"
Expand Down
6 changes: 4 additions & 2 deletions tests/server-acf2021-java11.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"name":"momentcfc-acf2021-java11",
"app":{
"cfengine":"adobe@2021"
"cfengine":"adobe@2021",
"timezone": "America/Vancouver"
},
"jvm":{
"javaVersion":"openjdk11"
"javaVersion":"openjdk11",
"jvmArgs":"-Duser.timezone=America/Vancouver"
},
"web":{
"webroot":"../"
Expand Down
6 changes: 4 additions & 2 deletions tests/server-acf2023-java17.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"name":"momentcfc-acf2023-java17",
"app":{
"cfengine":"adobe@2023"
"cfengine":"adobe@2023",
"timezone": "America/Vancouver"
},
"jvm":{
"javaVersion":"openjdk17"
"javaVersion":"openjdk17",
"jvmArgs":"-Duser.timezone=America/Vancouver"
},
"web":{
"webroot":"../"
Expand Down
6 changes: 4 additions & 2 deletions tests/server-acf2025-java21.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"name":"momentcfc-acf2025-java21",
"app":{
"cfengine":"adobe@2025"
"cfengine":"adobe@2025",
"timezone":"America/Vancouver"
},
"jvm":{
"javaVersion":"openjdk21"
"javaVersion":"openjdk21",
"jvmArgs":"-Duser.timezone=America/Vancouver"
},
"web":{
"webroot":"../"
Expand Down
14 changes: 14 additions & 0 deletions tests/server-lucee5-java11.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name":"momentcfc-lucee5-java11",
"app":{
"cfengine":"lucee@5",
"timezone":"America/Vancouver"
},
"jvm":{
"javaVersion":"openjdk11",
"jvmArgs":"-Duser.timezone=America/Vancouver"
},
"web":{
"webroot":"../"
}
}
6 changes: 4 additions & 2 deletions tests/server-lucee6-java21.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"name":"momentcfc-lucee6-java21",
"app":{
"cfengine":"lucee@6"
"cfengine":"lucee@6",
"timezone": "America/Vancouver"
},
"jvm":{
"javaVersion":"openjdk21"
"javaVersion":"openjdk21",
"jvmArgs":"-Duser.timezone=America/Vancouver"
},
"web":{
"webroot":"../"
Expand Down
Loading