From b6194c304d569c589871bc3f60836967bea197c2 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Wed, 23 Oct 2013 14:29:24 +0200
Subject: [PATCH 1/4] Default CMSMain to Versioned::reading_stage("Stage")

Regression caused by https://github.com/silverstripe/silverstripe-framework/pull/2585
---
 code/controllers/CMSMain.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php
index 860ea61d..c1d9c9eb 100644
--- a/code/controllers/CMSMain.php
+++ b/code/controllers/CMSMain.php
@@ -55,6 +55,8 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 		}
 		
 		parent::init();
+
+		Versioned::reading_stage("Stage");
 		
 		Requirements::css(CMS_DIR . '/css/screen.css');
 		Requirements::customCSS($this->generatePageIconsCss());

From ab4b72d4864bbab57c80982f3ffe66009ff90ae4 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 13 Feb 2014 18:54:44 +1300
Subject: [PATCH 2/4] FIX: Fixed testing of theme switching.

The previous theme test relied on the existence of the tutorial theme, which has been removed.
I'ved added a couple of behat rules for scaffolding fake themes, and altered the test to use these.
---
 .../features/bootstrap/FeatureContext.php     |  3 ++
 .../Cms/Test/Behaviour/ThemeContext.php       | 47 +++++++++++++++++++
 tests/behat/features/settings-main.feature    | 11 +++--
 3 files changed, 57 insertions(+), 4 deletions(-)
 create mode 100644 tests/behat/features/bootstrap/SilverStripe/Cms/Test/Behaviour/ThemeContext.php

diff --git a/tests/behat/features/bootstrap/FeatureContext.php b/tests/behat/features/bootstrap/FeatureContext.php
index 371d0986..2dce078e 100644
--- a/tests/behat/features/bootstrap/FeatureContext.php
+++ b/tests/behat/features/bootstrap/FeatureContext.php
@@ -36,6 +36,9 @@ class FeatureContext extends \SilverStripe\Framework\Test\Behaviour\FeatureConte
 		$fixtureContext->setFixtureFactory($this->getFixtureFactory());
 		$this->useContext('FixtureContext', $fixtureContext);
 
+		// Add extra contexts with more steps
+		$this->useContext('ThemeContext', new \SilverStripe\Cms\Test\Behaviour\ThemeContext($parameters));
+
 		// Use blueprints which auto-publish all subclasses of SiteTree
 		$factory = $fixtureContext->getFixtureFactory();
 		foreach(\ClassInfo::subclassesFor('SiteTree') as $id => $class) {
diff --git a/tests/behat/features/bootstrap/SilverStripe/Cms/Test/Behaviour/ThemeContext.php b/tests/behat/features/bootstrap/SilverStripe/Cms/Test/Behaviour/ThemeContext.php
new file mode 100644
index 00000000..511283b9
--- /dev/null
+++ b/tests/behat/features/bootstrap/SilverStripe/Cms/Test/Behaviour/ThemeContext.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace SilverStripe\Cms\Test\Behaviour;
+
+use Behat\Behat\Context\ClosuredContextInterface,
+	Behat\Behat\Context\TranslatedContextInterface,
+	Behat\Behat\Context\BehatContext,
+	Behat\Behat\Context\Step,
+	Behat\Behat\Event\StepEvent,
+	Behat\Behat\Exception\PendingException,
+	Behat\Mink\Driver\Selenium2Driver,
+	Behat\Gherkin\Node\PyStringNode,
+	Behat\Gherkin\Node\TableNode;
+
+// PHPUnit
+require_once 'PHPUnit/Autoload.php';
+require_once 'PHPUnit/Framework/Assert/Functions.php';
+
+/**
+ * Context used to create fixtures in the SilverStripe ORM.
+ */
+class ThemeContext extends BehatContext {
+
+	/**
+	 * Create a test theme
+	 * 
+	 * @Given /^a theme "(?<theme>[^"]+)"/
+	 */
+	public function stepCreateTheme($theme) {
+		if(!preg_match('/^[0-9a-zA-Z_-]+$/', $theme)) throw new \InvalidArgumentException("Bad theme '$theme'");
+
+		if(!file_exists(BASE_PATH . '/themes/' . $theme)) mkdir(BASE_PATH . '/themes/' . $theme);
+		if(!file_exists(BASE_PATH . '/themes/' . $theme . '/templates')) mkdir(BASE_PATH . '/themes/' . $theme . '/templates');
+	}
+
+	/**
+	 * Create a template within a test theme
+	 * 
+	 * @Given /^a template "(?<template>[^"]+)" in theme "(?<theme>[^"]+)" with content "(?<content>[^"]+)"/
+	 */
+	public function stepCreateTemplate($template, $theme, $content) {
+		if(!preg_match('/^[0-9a-zA-Z_-]+$/', $theme)) throw new \InvalidArgumentException("Bad theme '$theme'");
+		if(!preg_match('/^(Layout\/)?[0-9a-zA-Z_-]+\.ss$/', $template)) throw new \InvalidArgumentException("Bad template '$template'");
+
+		file_put_contents(BASE_PATH . '/themes/' . $theme . '/templates/' . $template, $content);
+	}	
+}
diff --git a/tests/behat/features/settings-main.feature b/tests/behat/features/settings-main.feature
index 0fc244b5..c2465b10 100644
--- a/tests/behat/features/settings-main.feature
+++ b/tests/behat/features/settings-main.feature
@@ -25,12 +25,15 @@ Feature: Edit site wide settings
 		And I should see "Site is under construction"
 
 	Scenario: I can change the theme of the website
-		Given I should see an edit page form
+		Given a theme "behattest"
+		And a template "Page.ss" in theme "behattest" with content "<h1>This is the behat test theme</h1>"
+		When I go to "/admin/settings"
+		Then I should see an edit page form
 		And I should see "Theme"
 
-		When I select "tutorial" from "Theme"
+		When I select "behattest" from "Theme"
 		And I press the "Save" button
 		And I reload the page
 
-		When I go to "/home"
-		Then I should see "Visit www.silverstripe.com to download the CMS"
\ No newline at end of file
+		When I go to "/home?flush=1"
+		Then I should see "This is the behat test theme"
\ No newline at end of file

From c0e6bf7132e44e89ad6890c3cdac8d4a97fb0412 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Fri, 14 Feb 2014 12:31:37 +1300
Subject: [PATCH 3/4] FIX: Added proper state-restoration code to the
 ThemeContext:

---
 .../Cms/Test/Behaviour/ThemeContext.php       | 70 +++++++++++++++++--
 1 file changed, 66 insertions(+), 4 deletions(-)

diff --git a/tests/behat/features/bootstrap/SilverStripe/Cms/Test/Behaviour/ThemeContext.php b/tests/behat/features/bootstrap/SilverStripe/Cms/Test/Behaviour/ThemeContext.php
index 511283b9..004586a7 100644
--- a/tests/behat/features/bootstrap/SilverStripe/Cms/Test/Behaviour/ThemeContext.php
+++ b/tests/behat/features/bootstrap/SilverStripe/Cms/Test/Behaviour/ThemeContext.php
@@ -21,6 +21,9 @@ require_once 'PHPUnit/Framework/Assert/Functions.php';
  */
 class ThemeContext extends BehatContext {
 
+	protected $restoreFiles = array();
+	protected $restoreDirectories = array();
+
 	/**
 	 * Create a test theme
 	 * 
@@ -29,8 +32,9 @@ class ThemeContext extends BehatContext {
 	public function stepCreateTheme($theme) {
 		if(!preg_match('/^[0-9a-zA-Z_-]+$/', $theme)) throw new \InvalidArgumentException("Bad theme '$theme'");
 
-		if(!file_exists(BASE_PATH . '/themes/' . $theme)) mkdir(BASE_PATH . '/themes/' . $theme);
-		if(!file_exists(BASE_PATH . '/themes/' . $theme . '/templates')) mkdir(BASE_PATH . '/themes/' . $theme . '/templates');
+		$this->requireDir(BASE_PATH . '/themes');
+		$this->requireDir(BASE_PATH . '/themes/' . $theme);
+		$this->requireDir(BASE_PATH . '/themes/' . $theme . '/templates');
 	}
 
 	/**
@@ -42,6 +46,64 @@ class ThemeContext extends BehatContext {
 		if(!preg_match('/^[0-9a-zA-Z_-]+$/', $theme)) throw new \InvalidArgumentException("Bad theme '$theme'");
 		if(!preg_match('/^(Layout\/)?[0-9a-zA-Z_-]+\.ss$/', $template)) throw new \InvalidArgumentException("Bad template '$template'");
 
-		file_put_contents(BASE_PATH . '/themes/' . $theme . '/templates/' . $template, $content);
-	}	
+		$this->stepCreateTheme($theme);
+		$this->requireFile(BASE_PATH . '/themes/' . $theme . '/templates/' . $template, $content);
+	}
+
+	protected function requireFile($filename, $content) {
+		// Already exists
+		if(file_exists($filename)) {
+			// If the content is different, remember old content for restoration
+			$origContent = file_get_contents($filename);
+			if($origContent != $content) {
+				file_put_contents($filename, $content);
+				$this->restoreFiles[$filename] = $origContent;
+			}
+		// Doesn't exist, mark it for deletion after test
+		} else {
+			file_put_contents($filename, $content);
+			$this->restoreFiles[$filename] = null;
+		}
+	}
+
+	protected function requireDir($dirname) {
+		// Directory doesn't exist, create it and mark it for deletion
+		if(!file_exists($dirname)) {
+			mkdir($dirname);
+			$this->restoreDirectories[] = $dirname;
+		}
+	}
+
+	/**
+	 * Clean up any theme manipulation
+	 * 
+	 * @AfterScenario
+	 */
+	public function cleanThemesAfterScenario() {
+		// Restore any created/modified files.
+		//  - If modified, revert then to original contnet
+		//  - If created, delete them
+		if($this->restoreFiles) {
+			foreach($this->restoreFiles as $file => $origContent) {
+				if($origContent === null) {
+					unlink($file);
+				} else {
+					file_put_contents($file, $origContent);
+				}
+			}
+
+			$this->restoreFiles = array();
+		}
+
+		// Restore any created directories: that is, delete them
+		if($this->restoreDirectories) {
+			// Flip the order so that nested direcotires are unlinked() first
+			$this->restoreDirectories = array_reverse($this->restoreDirectories);
+			foreach($this->restoreDirectories as $dir) {
+				rmdir($dir);
+			}
+
+			$this->restoreDirectories = array();
+		}
+	}
 }

From d69c8e5069f53c2551b009f260dc99a3265b4e86 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Fri, 14 Feb 2014 13:43:34 +1300
Subject: [PATCH 4/4] Minor improvement of theme switching test performance.

---
 tests/behat/features/settings-main.feature | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/behat/features/settings-main.feature b/tests/behat/features/settings-main.feature
index c2465b10..aafbd27a 100644
--- a/tests/behat/features/settings-main.feature
+++ b/tests/behat/features/settings-main.feature
@@ -33,7 +33,5 @@ Feature: Edit site wide settings
 
 		When I select "behattest" from "Theme"
 		And I press the "Save" button
-		And I reload the page
-
-		When I go to "/home?flush=1"
+		And I go to "/home?flush=1"
 		Then I should see "This is the behat test theme"
\ No newline at end of file