Skip to content

Commit

Permalink
cleanup and refactoring of tests
Browse files Browse the repository at this point in the history
  • Loading branch information
lmajano committed Jun 17, 2014
1 parent 341c031 commit 67625e5
Show file tree
Hide file tree
Showing 66 changed files with 13 additions and 436 deletions.
4 changes: 2 additions & 2 deletions config/Coldbox.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ limitations under the License.
missingTemplateHandler = "",

//Extension Points
UDFLibraryFile = "includes/helpers/ApplicationHelper.cfm",
UDFLibraryFile = "",
coldboxExtensionsLocation = "",
modulesExternalLocation = [],
pluginsExternalLocation = "",
Expand Down Expand Up @@ -122,7 +122,7 @@ limitations under the License.

// ORTUS DEVELOPMENT ENVIRONMENT, REMOVE FOR YOUR APP IF NEEDED
function development(){

//coldbox.debugmode=true;
coldbox.handlersIndexAutoReload = true;
coldbox.handlerCaching = false;
Expand Down
2 changes: 1 addition & 1 deletion handlers/Main.cfc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
component output="false" singleton{ // Default Action function index(event,rc,prc){ prc.welcomeMessage = "Welcome to ContentBox Modular CMS!"; event.setView("main/index"); } /************************************** IMPLICIT ACTIONS *********************************************/ function onAppInit(event,rc,prc){ } function onRequestStart(event,rc,prc){ } function onRequestEnd(event,rc,prc){ } function onSessionStart(event,rc,prc){ } function onSessionEnd(event,rc,prc){ var sessionScope = event.getValue("sessionReference"); var applicationScope = event.getValue("applicationReference"); } function onException(event,rc,prc){ //Grab Exception From request collection, placed by ColdBox var exceptionBean = event.getValue("ExceptionBean"); //Place exception handler below: } function onMissingTemplate(event,rc,prc){ //Grab missingTemplate From request collection, placed by ColdBox var missingTemplate = event.getValue("missingTemplate"); }}
component output="false" singleton{ // Default Action function index(event,rc,prc){ prc.welcomeMessage = "Welcome to ContentBox Modular CMS!"; event.setView( "main/index" ); } /************************************** IMPLICIT ACTIONS *********************************************/ function onAppInit(event,rc,prc){ } function onRequestStart(event,rc,prc){ } function onRequestEnd(event,rc,prc){ } function onSessionStart(event,rc,prc){ } function onSessionEnd(event,rc,prc){ var sessionScope = event.getValue("sessionReference"); var applicationScope = event.getValue("applicationReference"); } function onException(event,rc,prc){ //Grab Exception From request collection, placed by ColdBox var exceptionBean = event.getValue("ExceptionBean"); //Place exception handler below: } function onMissingTemplate(event,rc,prc){ //Grab missingTemplate From request collection, placed by ColdBox var missingTemplate = event.getValue("missingTemplate"); }}
Expand Down
1 change: 0 additions & 1 deletion includes/helpers/ApplicationHelper.cfm

This file was deleted.

Empty file removed includes/i18n/i18n_goes_here.txt
Empty file.
Binary file removed includes/images/ColdBoxLogoSquare_125.png
Binary file not shown.
Binary file removed includes/images/coldbox.png
Binary file not shown.
Binary file removed includes/images/glyphicons-halflings-white.png
Binary file not shown.
Binary file removed includes/images/glyphicons-halflings.png
Binary file not shown.
6 changes: 0 additions & 6 deletions includes/javascript/bootstrap.min.js

This file was deleted.

5 changes: 0 additions & 5 deletions includes/javascript/jquery.js

This file was deleted.

Empty file.
9 changes: 0 additions & 9 deletions includes/styles/bootstrap-responsive.min.css

This file was deleted.

9 changes: 0 additions & 9 deletions includes/styles/bootstrap.min.css

This file was deleted.

Empty file removed includes/styles/css_goes_here.txt
Empty file.
30 changes: 0 additions & 30 deletions includes/templates/404.html

This file was deleted.

45 changes: 0 additions & 45 deletions includes/templates/generic_error.cfm

This file was deleted.

2 changes: 1 addition & 1 deletion layouts/Main.cfm
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<cfoutput>#html.doctype()#<html lang="en"><head> <meta charset="utf-8"> <title>Welcome to Coldbox!</title> <meta name="description" content="ColdBox Application Template"> <meta name="author" content="Ortus Solutions, Corp"> <!---Base URL ---> <base href="#getSetting("HTMLBaseURL")#" /> <!---css ---> <link href="includes/styles/bootstrap.min.css" rel="stylesheet"> <link href="includes/styles/bootstrap-responsive.min.css" rel="stylesheet"> <!---js ---> <script src="includes/javascript/jquery.js"></script> <script src="includes/javascript/bootstrap.min.js"></script> <style> /* Utility */ .centered { text-align: center !important; } .inline{ display: inline !important; } .margin10{ margin: 10px; } .padding10{ padding: 10px; } .margin0{ margin: 0px; } .padding0{ padding: 0px; } .footer { margin-top: 45px; padding: 35px 35px; border-top: 1px solid ##e5e5e5; } .footer p { margin-bottom: 0; color: ##555; } body{ padding-top: 50px; } </style></head><body data-spy="scroll"> <!---Top NavBar ---> <div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar-inner"> <!---Brand ---> <div class="container"> <!---Responsive Design ---> <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </a> <!---Branding ---> <a class="brand" href="#event.buildLink('')#"><strong>Home</strong></a> <!---About ---> <ul class="nav pull-right"> <li class="dropdown"> <a href="##" class="dropdown-toggle" data-toggle="dropdown"> <i class="icon-info-sign icon-white"></i> About <b class="caret"></b> </a> <ul id="actions-submenu" class="dropdown-menu"> <li class="nav-header">#getSetting("codename",1)# (#getsetting("suffix",1)#) </li> <li><a href="mailto:[email protected]?subject=DataBoss Bug Report"><i class="icon-fire"></i> Report a Bug</a></li> <li><a href="mailto:[email protected]?subject=DataBoss Feedback"><i class="icon-bullhorn"></i> Send Us Feedback</a></li> <li><a href="http://www.ortussolutions.com/products/coldbox"><i class="icon-home"></i> Professional Support</a></li> <li class="centered"> <img src="includes/images/ColdBoxLogoSquare_125.png" alt="logo"/> </li> </ul> </li> </ul> </div> <!---end container ---> </div> <!---end navbar-inner ---> </div> <!---end navbar ---> <!---Container And Views ---> <div class="container">#renderView()#</div> <footer class="footer"> <p class="pull-right"> <a href="##"><i class="icon-arrow-up"></i> Back to top</a> </p> <p> <a href="http://www.coldbox.org">ColdBox Platform</a> is a copyright-trademark software by <a href="http://www.ortussolutions.com">Ortus Solutions, Corp</a> </p> <p> Design thanks to <a href="http://twitter.github.com/bootstrap">Twitter Boostrap</a> </p> </footer> <script> $(function() { // activate all drop downs $('.dropdown-toggle').dropdown(); // Tooltips $("[rel=tooltip]").tooltip(); // Scroll spy $('##subnav').scrollspy(); }) </script></body></html></cfoutput>
<cfoutput>#html.doctype()#<html lang="en"><head> <meta charset="utf-8"> <title>Welcome to ContentBox!</title> <meta name="description" content="ContentBox Application Template"> <meta name="author" content="Ortus Solutions, Corp"> <!---Base URL ---> <base href="#getSetting("HTMLBaseURL")#" /></head><body data-spy="scroll"> #renderView()#</body></html></cfoutput>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 8 additions & 0 deletions tests/logs/ContentBox.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
"Severity","Appender","Date","Time","Category","Message"
"INFO","FILES","09/19/2012","08:58:49","coldbox.system.cache.providers.CacheBoxColdBoxProvider","CacheBox Cache: default has been initialized successfully for operation"
"INFO","FILES","09/19/2012","08:58:49","coldbox.system.cache.providers.CacheBoxColdBoxProvider","CacheBox Cache: TEMPLATE has been initialized successfully for operation"
"WARN","FILES","09/19/2012","08:58:49","coldbox.system.web.services.ModuleService","The module (_gsdata_) cannot be loaded as it does not have a ModuleConfig.cfc in its root. Path Checked: /Users/lmajano/Sites/contentbox/www/modules/_gsdata_"
"INFO","FILES","09/19/2012","08:58:50","root.workbench.patches.1-0-7.Update","About to beggin 1.0.7 patching"
"INFO","FILES","09/19/2012","08:58:50","root.workbench.patches.1-0-7.Update","Added column for user preferences"
"INFO","FILES","09/19/2012","08:58:50","root.workbench.patches.1-0-7.Update","Added blog entry point setting"
"INFO","FILES","09/19/2012","08:58:50","root.workbench.patches.1-0-7.Update","Finalized 1.0.7 patching"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 67625e5

Please sign in to comment.