diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d165ad7..adf3035 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,27 +8,45 @@ jobs: tests: runs-on: ubuntu-latest name: Tests + continue-on-error: ${{ matrix.experimental }} strategy: fail-fast: false matrix: - cfengine: ["lucee@5", "adobe@2018", "adobe@2021", "adobe@2023", "boxlang@be"] + cfengine: ["lucee@5", "lucee@6", "adobe@2018", "adobe@2021", "adobe@2023", "boxlang@be"] coldbox: ["coldbox@6", "coldbox@7"] + experimental: [ false ] + # Experimental Engine Support + include: + - coldbox: "coldbox@7" + cfengine: "adobe@2025" + experimental: true steps: - name: Checkout Repository uses: actions/checkout@v2 + - name: Setup Java + if: ${{ matrix.cfengine == 'boxlang@be' || matrix.cfengine == 'adobe@2025' }} + uses: actions/setup-java@v4 + with: + distribution: "temurin" + java-version: "21" + - name: Setup Java JDK + if: ${{ matrix.cfengine != 'boxlang@be' && matrix.cfengine != 'adobe@2025' }} uses: actions/setup-java@v1.4.3 with: java-version: 11 - name: Set Up CommandBox - uses: elpete/setup-commandbox@v1.0.0 + uses: ortus-solutions/setup-commandbox@v2.0.1 + with: + # Update when 6.2 is released + version: "6.2.0-alpha" - name: Install dependencies run: | box install - box install ${{ matrix.coldbox }} --noSave + box install ${{ matrix.coldbox }} --force --noSave - name: Start server run: | diff --git a/models/HyperRequest.cfc b/models/HyperRequest.cfc index fcd5597..505b0fe 100644 --- a/models/HyperRequest.cfc +++ b/models/HyperRequest.cfc @@ -1283,7 +1283,7 @@ component accessors="true" { req.setBody( duplicate( variables.body ) ); req.setBodyFormat( variables.bodyFormat ); req.setReferrer( isNull( variables.referrer ) ? javacast( "null", "" ) : variables.referrer ); - req.setHeaders( variables.headers.clone() ); + req.setHeaders( variables.headers.duplicate() ); req.setQueryParams( duplicate( variables.queryParams ) ); req.setFiles( duplicate( variables.files ) ); req.setThrowOnError( variables.throwOnError ); diff --git a/tests/specs/unit/HyperResponseSpec.cfc b/tests/specs/unit/HyperResponseSpec.cfc index dad5b7a..749743f 100644 --- a/tests/specs/unit/HyperResponseSpec.cfc +++ b/tests/specs/unit/HyperResponseSpec.cfc @@ -228,7 +228,7 @@ component extends="testbox.system.BaseSpec" { headers = { "Set-Cookie" : [ "foo=bar;path=/;secure;samesite=none;httponly", - "baz=qux;path=/;expires=Mon, 31 Dec 2038 23:59:59 GMT", + "baz=qux;path=/;expires=Fri, 31 Dec 2038 23:59:59 GMT", "one=two;max-age=2592000;domain=example.com" ] } @@ -244,7 +244,7 @@ component extends="testbox.system.BaseSpec" { "baz" : { "value" : "qux", "path" : "/", - "expires" : "Mon, 31 Dec 2038 23:59:59 GMT" + "expires" : "Fri, 31 Dec 2038 23:59:59 GMT" }, "one" : { "value" : "two", @@ -262,7 +262,7 @@ component extends="testbox.system.BaseSpec" { headers = { "Set-Cookie" : [ "foo=bar;path=/;secure;samesite=none;httponly", - "baz=qux;path=/;expires=Mon, 31 Dec 2038 23:59:59 GMT", + "baz=qux;path=/;expires=Fri, 31 Dec 2038 23:59:59 GMT", "one=two;max-age=2592000;domain=example.com" ] }