Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
lmajano committed Apr 28, 2020
2 parents 6a73ae2 + 938c4d3 commit 1d01daa
Show file tree
Hide file tree
Showing 84 changed files with 6,772 additions and 4,689 deletions.
13 changes: 13 additions & 0 deletions .cfconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"systemErr":"System",
"systemOut":"System",
"adminPassword" : "testbox",
"debuggingEnabled": true,
"debuggingShowDatabase":true,
"debuggingShowException":true,
"debuggingShowGeneral":true,
"ajaxDebugWindowEnabled": false,
"debuggingReportExecutionTimes": false,
"maxCFThreads":100,
"whitespaceManagement":"smart"
}
1 change: 1 addition & 0 deletions .cfformat.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"max_columns": 120,
"metadata.multiline.element_count": 3,
"metadata.multiline.min_length": 40,
"newline":"\n",
"property.multiline.element_count": 3,
"property.multiline.min_length": 40,
"parentheses.padding": true,
Expand Down
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ notifications:
env:
matrix:
- ENGINE=lucee@5
- ENGINE=adobe@11
- ENGINE=adobe@2016
- ENGINE=adobe@2018

Expand Down
18 changes: 10 additions & 8 deletions Application.cfc
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
/**
* Copyright Since 2005 Ortus Solutions, Corp
* www.ortussolutions.com
**************************************************************************************
*/
component{
this.name = "TestBox Development Suite " & hash( getCurrentTemplatePath() );
this.sessionManagement = true;
* Copyright Since 2005 Ortus Solutions, Corp
* www.ortussolutions.com
**************************************************************************************
*/
component {

this.name = "TestBox Development Suite " & hash( getCurrentTemplatePath() );
this.sessionManagement = true;
// Local mappings
this.mappings[ "/testbox" ] = getDirectoryFromPath( getCurrentTemplatePath() );
}

}
18 changes: 12 additions & 6 deletions box.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name":"TestBox",
"version":"3.2.0",
"version":"4.0.0",
"location":"https://downloads.ortussolutions.com/ortussolutions/testbox/@build.version@/[email protected]@.zip",
"author":"Ortus Solutions <[email protected]>",
"slug":"testbox",
Expand Down Expand Up @@ -36,13 +36,19 @@
"watchDelay":"250"
},
"dependencies":{
"cbstreams":"^1.5.0"
"cbstreams":"^1.5.0",
"mockdatacfc":"^3.3.0+22"
},
"installPaths":{
"cbstreams":"system/modules/cbstreams/"
},
"scripts":{
"cbstreams":"system/modules/cbstreams/",
"mockdatacfc":"system/modules/mockdatacfc/"
},
"scripts":{
"toMaster":"recipe build/toMaster.boxr",
"format":"cfformat run system/**/*.cfc,test-harness/**/*.cfc,tests/specs/**/*.cfc,*.cfc --overwrite",
"format:check":"cfformat run system/**/*.cfc,test-harness/**/*.cfc,tests/specs/**/*.cfc,*.cfc --check"
"format:check":"cfformat run system/**/*.cfc,test-harness/**/*.cfc,tests/specs/**/*.cfc,*.cfc --check",
"start:lucee":"server start [email protected]",
"start:2016":"server start [email protected]",
"start:2018":"server start [email protected]"
}
}
20 changes: 20 additions & 0 deletions build/toMaster.boxr
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# This recipe signifies a new release of the module by doing merges and bumps accordingly

# Check out master
!git checkout -f master
!git pull
# Merge development into it
!git merge --no-ff development
# Tag the master repo with the version in box.json
!git tag v`box package show version`
# Push all branches
!git push origin --all
# Push all tags
!git push origin --tags
# Check development again
!git checkout -f development
# Bump to prepare for a new release, do minor, change if needed and don't tag
bump --minor --!tagVersion
# Send it out
!git commit -a -m "version bump"
!git push origin development
88 changes: 56 additions & 32 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,50 +1,77 @@

[![Build Status](https://travis-ci.org/Ortus-Solutions/TestBox.svg?branch=development)](https://travis-ci.org/Ortus-Solutions/TestBox)

```
_____ _ ____
|_ _|__ ___| |_| __ ) _____ __
| |/ _ \/ __| __| _ \ / _ \ \/ /
| | __/\__ \ |_| |_) | (_) > <
|_|\___||___/\__|____/ \___/_/\_\
```
<p align="center">
<img src="https://www.ortussolutions.com/__media/testbox-185.png">
<img src="https://www.ortussolutions.com/__media/mockbox-185.png">
</p>

<p align="center">
<a href="https://travis-ci.org/ortus-solutions/testbox"><img src="https://travis-ci.org/ortus-solutions/testbox.svg?branch=development" alt="Build Status"></a>
<a href="https://forgebox.io/view/testbox"><img src="https://forgebox.io/api/v1/entry/testbox/badges/downloads" alt="Total Downloads" /></a>
<a href="https://forgebox.io/view/testbox"><img src="https://forgebox.io/api/v1/entry/testbox/badges/version" alt="Latest Stable Version" /></a>
<a href="https://forgebox.io/view/testbox"><img src="https://img.shields.io/badge/License-Apache2-brightgreen" alt="Apache2 License" /></a>
</p>

<p align="center">
Copyright Since 2005 TestBox by Luis Majano and Ortus Solutions, Corp
<br>
<a href="https://www.ortussolutions.com/products/testbox">www.ortussolutions.com</a>
</p>

----

TestBox is a Behavior Driven Development (BDD) and Test Driven Development (TDD) framework for ColdFusion (CFML). It also includes mocking and stubbing capabilities via its internal MockBox library.

## LICENSE
## License

Apache License, Version 2.0.

## IMPORTANT LINKS
## Versioning

TestBox is maintained under the Semantic Versioning guidelines as much as possible.

Releases will be numbered with the following format:

```html
<major>.<minor>.<patch>
```

And constructed with the following guidelines:

* Breaking backward compatibility bumps the major (and resets the minor and patch)
* New additions without breaking backward compatibility bumps the minor (and resets the patch)
* Bug fixes and misc changes bumps the patch

## Important Links

Source
### Source Code

- https://github.com/Ortus-Solutions/TestBox
* https://github.com/Ortus-Solutions/TestBox

Bug Tracking
### Bug Tracking

- https://ortussolutions.atlassian.net/browse/TESTBOX
* https://ortussolutions.atlassian.net/browse/TESTBOX

Support Forum
### Support

- https://groups.google.com/a/ortussolutions.com/forum/#!forum/testbox
* https://groups.google.com/a/ortussolutions.com/forum/#!forum/testbox
* [Join BoxTeam Slack](https://boxteam.herokuapp.com)

Documentation
### Documentation

- https://testbox.ortusbooks.com
- https://testbox.ortusbooks.com/content/primers/bdd/index.html
- https://testbox.ortusbooks.com/content/primers/xunit/index.html
* https://testbox.ortusbooks.com
* https://testbox.ortusbooks.com/content/primers/bdd/index.html
* https://testbox.ortusbooks.com/content/primers/xunit/index.html

Official Site
### Official Site

- https://www.ortussolutions.com/products/testbox
* https://www.ortussolutions.com/products/testbox

## SYSTEM REQUIREMENTS
## Requirements

- Lucee 5+ (xUnit + BDD)
- ColdFusion 11+ (xUnit + BDD)
<img src="https://cfmlbadges.monkehworks.com/images/badges/compatibility-coldfusion-2018.svg"><br>
<img src="https://cfmlbadges.monkehworks.com/images/badges/compatibility-coldfusion-2016.svg"><br>
<img src="https://cfmlbadges.monkehworks.com/images/badges/compatibility-lucee-5.svg">

## TESTBOX INSTALLATION
## Installation

You can visit the TestBox documentation page to view all of its features and
capabilities. To install TestBox just drop it in your web root as `/testbox` or
Expand All @@ -63,10 +90,7 @@ You can also use [CommandBox](https://www.ortussolutions.com/products/commandbox

Bleeding edge builds are updated automatically as code is committed.

********************************************************************************
Copyright Since 2005 by Luis Majano and Ortus Solutions, Corp
www.ortussolutions.com
********************************************************************************
----

### HONOR GOES TO GOD ABOVE ALL

Expand Down
15 changes: 0 additions & 15 deletions [email protected]

This file was deleted.

18 changes: 10 additions & 8 deletions system/Application.cfc
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
/**
* Copyright Since 2005 TestBox Framework by Luis Majano and Ortus Solutions, Corp
* www.ortussolutions.com
* ---
* This is the base Application.cfc for the TestBox testing suite
* Whenever you are running tests from within TestBox Core
*/
component{
* Copyright Since 2005 TestBox Framework by Luis Majano and Ortus Solutions, Corp
* www.ortussolutions.com
* ---
* This is the base Application.cfc for the TestBox testing suite
* Whenever you are running tests from within TestBox Core
*/
component {

this.name = "TestBox Testing Suite";
}

}
Loading

0 comments on commit 1d01daa

Please sign in to comment.