Merge remote-tracking branch 'origin/3.0'

.gitignore

@@ -7,3 +7,5 @@ silverstripe-cache
 .settings
 .idea
 .DS_Store
+vendor/
+composer.lock

.mergesources.yml

@@ -1,11 +0,0 @@
-# Data source for the "arb" svn merge tool (see http://github.com/sminnee/arborist).
-# Keeps track of all opensource branches of submodules 
-# that could be merged back to the current submodule paths.
-2.3:
-  .: /open/phpinstaller/branches/2.3
-  sapphire: /open/modules/sapphire/branches/2.3
-  cms: /open/modules/cms/branches/2.3
-2.4:
-  .: /open/phpinstaller/branches/2.4
-  sapphire: /open/modules/sapphire/branches/2.4
-  cms: /open/modules/cms/branches/2.4

README.md

@@ -24,7 +24,7 @@ and [installation from source](http://doc.silverstripe.org/framework/en/installa
 
 ## License ##
 
-	Copyright (c) 2007-2011, SilverStripe Limited - www.silverstripe.com
+	Copyright (c) 2007-2012, SilverStripe Limited - www.silverstripe.com
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

behat.yml

@@ -0,0 +1,20 @@
+default:
+  extensions:
+
+    SilverStripe\BehatExtension\Extension:
+      framework_path: framework
+
+    Behat\MinkExtension\Extension:
+      # Adjust this to your own website URL.
+      # Uncomment, or set through environment variable:
+      # > export BEHAT_PARAMS="extensions[Behat\MinkExtension\Extension][base_url]=http://localhost/"
+      # 
+      # base_url:  http://localhost/
+
+      # TODO Dynamically set through LocatorProcessor
+      files_path: %behat.paths.base%/framework/tests/behat/features/files/
+      default_session: selenium2
+      javascript_session: selenium2
+      goutte: ~
+      selenium2:
+        browser: firefox

build.xml

@@ -119,6 +119,41 @@ Options:
 		=================================================================
 	-->
 
+	<target name="phpunit"
+		description="Runs unit tests as defined through phpunix.xml. Requires the 'phpunit' binary.">
+		<if>
+			<available file="${basedir}/vendor/bin/phpunit" />
+			<then>
+				<property name="phpunit_bin" value="vendor/bin/phpunit" />
+			</then>
+			<else>
+				<property name="phpunit_bin" value="phpunit" />
+			</else>
+		</if>
+		<exec command="${phpunit_bin}" checkreturn="true" passthru="true" />
+	</target>
+
+	<target name="behat" if="basedir" 
+		description="Runs behaviour tests through Behat, on the 'framework' and 'cms' modules (if available). Requires phpunit, composer and behat.">
+
+		<if>
+			<available file="${basedir}/framework/" type="dir" />
+			<then>
+				<echo msg="Testing 'framework' module" />
+				<exec command="vendor/bin/behat --ansi @framework" checkreturn="true" passthru="true" />	
+			</then>
+		</if>
+		
+		<if>
+			<available file="${basedir}/cms/" type="dir" />
+			<then>
+				<echo msg="Testing 'cms' module" />
+				<exec command="vendor/bin/behat --ansi @cms" checkreturn="true" passthru="true" />	
+			</then>
+		</if>
+
+	</target>
+
 	<target name="tag" if="basedir" 
 		description="Creates a new git tag in all the nested working copies (optionally pushes the created tag)"
 		depends="_gitRepositories,_gitBinary">
@@ -233,7 +268,8 @@ Options:
 				<exclude name="_ss_environment.php" />
 				<exclude name="*.tar.gz" />
 				<exclude name="*.zip" />
-
+				<exclude name="behat.yml" />
+				<exclude name="composer.*" />
 			</fileset>
 			<fileset dir="${basedir}">
 				<include name="assets/Uploads" />
@@ -264,7 +300,8 @@ Options:
 				<exclude name="_ss_environment.php" />
 				<exclude name="*.tar.gz" />
 				<exclude name="*.zip" />
-
+				<exclude name="behat.yml" />
+				<exclude name="composer.*" />
 				<exclude name="cms/**" />
 			</fileset>
 			<fileset dir="${basedir}">

composer.json

@@ -3,13 +3,14 @@
 	"description": "The SilverStripe Framework Installer",
 	"require": {
 		"php": ">=5.3.2",
-		"silverstripe/cms": "self.version",
+		"silverstripe/cms": "dev-master",
-		"silverstripe/framework": "self.version",
+		"silverstripe/framework": "dev-master",
 		"silverstripe-themes/simple": "*"
 	},
 	"require-dev": {
-		"silverstripe/compass": "*",
+		"silverstripe/docsviewer": "*",
-		"silverstripe/docsviewer": "*"
+		"silverstripe/behat-extension": "*",
+		"phpunit/phpunit": "3.7.*"
 	},
 	"minimum-stability": "dev"
 }

phpunit.xml.dist

@@ -10,13 +10,11 @@
 	 - "phpunit framework/tests/filesystem/FolderTest.php": Run a single test
 	 - "phpunit <dash><dash>coverage-html assets/": Generate coverage report (replace <dash> with "-", requires xdebug)
 	
-	Further information:
+	More information:
-	- http://www.phpunit.de/manual/current/en/textui.html for more commandline options.
+	- http://www.phpunit.de/manual/current/en/textui.html
-	- http://github.com/chillu/silverstripe-doc-restructuring/blob/master/master/cms/docs/en/howto/phpunit-configuration.md
+	- http://doc.silverstripe.org/framework/en/topics/testing/#configuration
-	  for more information on configuration and execution options.
-	- framework/dev/TestRunner.php for an alternative way to run unit tests through the "sake" CLI tool.
 -->
-<phpunit bootstrap="framework/tests/bootstrap.php" colors="true" backupGlobals="false" backupStaticAttributes="false" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" syntaxCheck="false" verbose="true" strict="true">
+<phpunit bootstrap="framework/tests/bootstrap.php" colors="true">
 
 	<testsuite name="Default">
 		<directory>mysite/tests</directory>