Merge branch 'development'

# Conflicts:
#	system/MockBox.cfc

.travis.yml

@@ -29,14 +29,12 @@ before_install:
 install:
   # Install Commandbox
   - sudo apt-get update && sudo apt-get --assume-yes install jq commandbox ant-optional
-  # Test that the box binary is available and ready for our tests
-  - box version
+  # Install dependencies
+  - box install && box install commandbox-cfconfig,commandbox-dotenv
   # If using auto-publish, you will need to provide your API token with this line:
   - box config set endpoints.forgebox.APIToken=$FORGEBOX_API_TOKEN > /dev/null
 
 script:
-  # run our dependency install to ensure the workbench is in place
-  - box install
   # Execute build via ANT
   - ant -DisTravis=true -Dcfengine=$ENGINE -Dbuild.number=$TRAVIS_BUILD_NUMBER -Dbuild.branch=$TRAVIS_BRANCH -f build/build.xml
   # Set Current Version
@@ -45,10 +43,13 @@ script:
 
 after_failure:
   - cd $TRAVIS_BUILD_DIR
+  # Get response from test server to see what went wrong
+  - curl http://localhost:49616/tests/runner.cfm?reporter=text
   # Display the contents of our root directory
   # Spit out our Commandbox log in case we need to debug
   - box server log name=$ENGINE
   - cat `box system-log`
+  - ls -l $TRAVIS_BUILD_DIR/apidocs
 
 deploy:
   # Binary Deployments
@@ -84,4 +85,5 @@ deploy:
     acl: public_read
 
 after_deploy:
-  - cd $TRAVIS_BUILD_DIR/build-testbox/testbox && box forgebox publish
+  - cd $TRAVIS_BUILD_DIR/build-testbox/testbox
+  - if [ ${ENGINE} = '[email protected]' ]; then box forgebox publish; fi

build/build.xml

@@ -9,7 +9,7 @@
 
 	<!-- Version: UPDATE ON EACH RELEASE AS NEEDED -->
 	<property name="groupID"			value="ortussolutions" />
-	<property name="testbox.version"	value="2.6.0"/>
+	<property name="testbox.version"	value="2.7.0"/>
 	<property name="testbox.slug"		value="testbox"/>
 
 	<condition property="isTravis" else="false">

readme.md

@@ -12,37 +12,45 @@
 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
+
 Apache License, Version 2.0.
 
 ## IMPORTANT LINKS
+
 Source
+
 - https://github.com/Ortus-Solutions/TestBox
 
 Bug Tracking
+
 - https://ortussolutions.atlassian.net/browse/TESTBOX
 
 Support Forum
+
 - https://groups.google.com/a/ortussolutions.com/forum/#!forum/testbox
 
 Documentation
+
 - https://testbox.ortusbooks.com
 - https://testbox.ortusbooks.com/content/primers/bdd/index.html
 - https://testbox.ortusbooks.com/content/primers/xunit/index.html
 
 Official Site
+
 - https://www.ortussolutions.com/products/testbox
 
 ## SYSTEM REQUIREMENTS
+
 - Lucee 4.5+ (xUnit + BDD)
-- ColdFusion 10+ (xUnit + BDD)
+- ColdFusion 11+ (xUnit + BDD)
 
 ## TESTBOX 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
 create a mapping in your CFML administrator or `Application.cfc` that points to the
 directory you installed TestBox and create the mapping `/testbox` that points to it.
 
-You can also use [CommandBox](http://www.ortussolutions.com/products/commandbox) to install and leverage TestBox for commandline executions, test generations, watchers and much more:
+You can also use [CommandBox](https://www.ortussolutions.com/products/commandbox) to install and leverage TestBox for commandline executions, test generations, watchers and much more:
 
 **Stable Release**