<% end_if %>
diff --git a/templates/SapphireInfo.ss b/templates/SapphireInfo.ss
index 774f4dbff..dadbee6b0 100644
--- a/templates/SapphireInfo.ss
+++ b/templates/SapphireInfo.ss
@@ -1,15 +1,15 @@
- Sapphire Application Information
+ SilverStripe Application Information
-
Sapphire Application Information
+
SilverStripe Application Information
-
Sapphire version:
$Version
+
SilverStripe version:
$Version
Environment type:
$EnvironmentType
Site URL:
$BaseURL
-
\ No newline at end of file
+
diff --git a/templates/TableField.ss b/templates/TableField.ss
index 7424c0a94..141b8e671 100644
--- a/templates/TableField.ss
+++ b/templates/TableField.ss
@@ -30,7 +30,7 @@
<% if Can(add) %>
diff --git a/templates/TableListField.ss b/templates/TableListField.ss
index f6349c548..ccd441a4c 100644
--- a/templates/TableListField.ss
+++ b/templates/TableListField.ss
@@ -24,9 +24,9 @@
<% if SortDirection = desc %>
-
+
<% else %>
-
+
<% end_if %>
diff --git a/templates/TestViewer.ss b/templates/TestViewer.ss
index 98537b656..cf913d72b 100644
--- a/templates/TestViewer.ss
+++ b/templates/TestViewer.ss
@@ -1,9 +1,9 @@
<% base_tag %>
-
+
$Content
-
\ No newline at end of file
+
diff --git a/templates/forms/ToggleCompositeField.ss b/templates/forms/ToggleCompositeField.ss
index 09218270b..cf7a65659 100644
--- a/templates/forms/ToggleCompositeField.ss
+++ b/templates/forms/ToggleCompositeField.ss
@@ -1,7 +1,7 @@
-
-
+
+
$Title
@@ -9,4 +9,4 @@
$FieldHolder
<% end_control %>
-
\ No newline at end of file
+
diff --git a/tests/FullTestSuite.php b/tests/FullTestSuite.php
index 709bfcc92..e7525b463 100644
--- a/tests/FullTestSuite.php
+++ b/tests/FullTestSuite.php
@@ -6,9 +6,9 @@
* to group or testsuite definitions in a custom phpunit.xml file.
*
* Usage:
- * - "phpunit sapphire/tests/FullTestSuite.php"
+ * - "phpunit framework/tests/FullTestSuite.php"
* (all tests)
- * - "phpunit sapphire/tests/FullTestSuite.php '' module=sapphire,cms"
+ * - "phpunit framework/tests/FullTestSuite.php '' module=framework,cms"
* (comma-separated modules. empty quotes are necessary to avoid PHPUnit argument confusion)
*
* See http://www.phpunit.de/manual/current/en/organizing-tests.html#organizing-tests.testsuite
@@ -27,7 +27,7 @@ class FullTestSuite {
* @return PHPUnit_Framework_TestSuite
*/
public static function suite() {
- require_once('sapphire/tests/bootstrap.php');
+ require_once(dirname(__FILE__) . '/bootstrap.php');
$suite = new PHPUnit_Framework_TestSuite();
if(isset($_GET['module'])) {
@@ -47,7 +47,7 @@ class FullTestSuite {
* @return Array
*/
public static function get_all_tests() {
- require_once('sapphire/tests/bootstrap.php');
+ require_once(dirname(__FILE__) . '/bootstrap.php');
TestRunner::use_test_manifest();
$tests = ClassInfo::subclassesFor('SapphireTest');
@@ -58,13 +58,13 @@ class FullTestSuite {
/**
* Run tests for one or more "modules".
- * A module is generally a toplevel folder, e.g. "mysite" or "sapphire".
+ * A module is generally a toplevel folder, e.g. "mysite" or "framework".
*
* @param String $nameStr
* @return Array
*/
protected static function get_module_tests($namesStr) {
- require_once('sapphire/tests/bootstrap.php');
+ require_once(dirname(__FILE__) . '/bootstrap.php');
$tests = array();
$names = explode(',', $namesStr);
diff --git a/tests/PhpSyntaxTest.php b/tests/PhpSyntaxTest.php
index 5e7b13a6c..b6c02af73 100644
--- a/tests/PhpSyntaxTest.php
+++ b/tests/PhpSyntaxTest.php
@@ -24,7 +24,7 @@ class PhpSyntaxTest extends SapphireTest {
$settingTests = array('short_open_tag=Off','short_open_tag=On -d asp_tags=On');
$files = $this->getAllFiles('php');
- $files[] = BASE_PATH.'/sapphire/dev/install/config-form.html';
+ $files[] = FRAMEWORK_PATH.'/dev/install/config-form.html';
foreach($files as $i => $file) {
$CLI_file = escapeshellarg($file);
@@ -47,4 +47,4 @@ class PhpSyntaxTest extends SapphireTest {
);
return explode("\n", trim(`$cmd`));
}
-}
\ No newline at end of file
+}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 50b2b2fb3..3f75d4d49 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,5 +1,5 @@
'HTTP/1.1',
'REQUEST_METHOD' => 'GET',
'REQUEST_URI' => '/',
- 'SCRIPT_NAME' => '/sapphire/main.php',
+ 'SCRIPT_NAME' => FRAMEWORK_DIR . '/main.php',
'CONTENT_TYPE' => 'text/xml',
'CONTENT_LENGTH' => 10
);
@@ -281,4 +281,4 @@ class DirectorTestRequest_Controller extends Controller implements TestOnly {
public function returnCookieValue($request) { return $_COOKIE['somekey']; }
-}
\ No newline at end of file
+}
diff --git a/tests/core/ClassInfoTest.php b/tests/core/ClassInfoTest.php
index 9d97bfd4f..e81fac983 100644
--- a/tests/core/ClassInfoTest.php
+++ b/tests/core/ClassInfoTest.php
@@ -24,10 +24,10 @@ class ClassInfoTest extends SapphireTest {
}
function testClassesForFolder() {
- //$baseFolder = Director::baseFolder() . '/' . SAPPHIRE_DIR . '/tests/_ClassInfoTest';
+ //$baseFolder = Director::baseFolder() . '/' . FRAMEWORK_DIR . '/tests/_ClassInfoTest';
//$manifestInfo = ManifestBuilder::get_manifest_info($baseFolder);
- $classes = ClassInfo::classes_for_folder('sapphire/tests');
+ $classes = ClassInfo::classes_for_folder(FRAMEWORK_DIR . '/tests');
$this->assertContains(
'classinfotest',
$classes,
diff --git a/tests/core/CoreTest.php b/tests/core/CoreTest.php
index 46ae937cb..ee5cff55d 100644
--- a/tests/core/CoreTest.php
+++ b/tests/core/CoreTest.php
@@ -1,6 +1,6 @@
'module/classes/ClassA.php',
- 'Sapphire\Test\ClassA' => 'module/classes/ClassA.php',
- 'sapphire\test\classa' => 'module/classes/ClassA.php',
- 'SAPPHIRE\TEST\INTERFACEA' => 'module/interfaces/InterfaceA.php',
- 'Sapphire\Test\InterfaceA' => 'module/interfaces/InterfaceA.php',
- 'sapphire\test\interfacea' => 'module/interfaces/InterfaceA.php'
+ 'SILVERSTRIPE\TEST\CLASSA' => 'module/classes/ClassA.php',
+ 'Silverstripe\Test\ClassA' => 'module/classes/ClassA.php',
+ 'silverstripe\test\classa' => 'module/classes/ClassA.php',
+ 'SILVERSTRIPE\TEST\INTERFACEA' => 'module/interfaces/InterfaceA.php',
+ 'Silverstripe\Test\InterfaceA' => 'module/interfaces/InterfaceA.php',
+ 'silverstripe\test\interfacea' => 'module/interfaces/InterfaceA.php'
);
foreach ($expect as $name => $path) {
@@ -38,14 +38,14 @@ class NamespacedClassManifestTest extends SapphireTest {
public function testGetClasses() {
$expect = array(
- 'sapphire\test\classa' => "{$this->base}/module/classes/ClassA.php",
- 'sapphire\test\classb' => "{$this->base}/module/classes/ClassB.php",
- 'sapphire\test\classc' => "{$this->base}/module/classes/ClassC.php",
- 'sapphire\test\classd' => "{$this->base}/module/classes/ClassD.php",
- 'sapphire\test\classe' => "{$this->base}/module/classes/ClassE.php",
- 'sapphire\test\classf' => "{$this->base}/module/classes/ClassF.php",
- 'sapphire\test\classg' => "{$this->base}/module/classes/ClassG.php",
- 'sapphire\test\classh' => "{$this->base}/module/classes/ClassH.php"
+ 'silverstripe\test\classa' => "{$this->base}/module/classes/ClassA.php",
+ 'silverstripe\test\classb' => "{$this->base}/module/classes/ClassB.php",
+ 'silverstripe\test\classc' => "{$this->base}/module/classes/ClassC.php",
+ 'silverstripe\test\classd' => "{$this->base}/module/classes/ClassD.php",
+ 'silverstripe\test\classe' => "{$this->base}/module/classes/ClassE.php",
+ 'silverstripe\test\classf' => "{$this->base}/module/classes/ClassF.php",
+ 'silverstripe\test\classg' => "{$this->base}/module/classes/ClassG.php",
+ 'silverstripe\test\classh' => "{$this->base}/module/classes/ClassH.php"
);
$this->assertEquals($expect, $this->manifest->getClasses());
@@ -53,13 +53,13 @@ class NamespacedClassManifestTest extends SapphireTest {
public function testGetClassNames() {
$this->assertEquals(
- array('sapphire\test\classa', 'sapphire\test\classb', 'sapphire\test\classc', 'sapphire\test\classd', 'sapphire\test\classe', 'sapphire\test\classf', 'sapphire\test\classg', 'sapphire\test\classh'),
+ array('silverstripe\test\classa', 'silverstripe\test\classb', 'silverstripe\test\classc', 'silverstripe\test\classd', 'silverstripe\test\classe', 'silverstripe\test\classf', 'silverstripe\test\classg', 'silverstripe\test\classh'),
$this->manifest->getClassNames());
}
public function testGetDescendants() {
$expect = array(
- 'sapphire\test\classa' => array('sapphire\test\ClassB', 'sapphire\test\ClassH'),
+ 'silverstripe\test\classa' => array('silverstripe\test\ClassB', 'silverstripe\test\ClassH'),
);
$this->assertEquals($expect, $this->manifest->getDescendants());
@@ -67,8 +67,8 @@ class NamespacedClassManifestTest extends SapphireTest {
public function testGetDescendantsOf() {
$expect = array(
- 'SAPPHIRE\TEST\CLASSA' => array('sapphire\test\ClassB', 'sapphire\test\ClassH'),
- 'sapphire\test\classa' => array('sapphire\test\ClassB', 'sapphire\test\ClassH'),
+ 'SILVERSTRIPE\TEST\CLASSA' => array('silverstripe\test\ClassB', 'silverstripe\test\ClassH'),
+ 'silverstripe\test\classa' => array('silverstripe\test\ClassB', 'silverstripe\test\ClassH'),
);
foreach ($expect as $class => $desc) {
@@ -78,28 +78,28 @@ class NamespacedClassManifestTest extends SapphireTest {
public function testGetInterfaces() {
$expect = array(
- 'sapphire\test\interfacea' => "{$this->base}/module/interfaces/InterfaceA.php",
+ 'silverstripe\test\interfacea' => "{$this->base}/module/interfaces/InterfaceA.php",
);
$this->assertEquals($expect, $this->manifest->getInterfaces());
}
public function testGetImplementors() {
$expect = array(
- 'sapphire\test\interfacea' => array('sapphire\test\ClassE'),
- 'interfacea' => array('sapphire\test\ClassF'),
- 'sapphire\test\subtest\interfacea' => array('sapphire\test\ClassG')
+ 'silverstripe\test\interfacea' => array('silverstripe\test\ClassE'),
+ 'interfacea' => array('silverstripe\test\ClassF'),
+ 'silverstripe\test\subtest\interfacea' => array('silverstripe\test\ClassG')
);
$this->assertEquals($expect, $this->manifest->getImplementors());
}
public function testGetImplementorsOf() {
$expect = array(
- 'SAPPHIRE\TEST\INTERFACEA' => array('sapphire\test\ClassE'),
- 'sapphire\test\interfacea' => array('sapphire\test\ClassE'),
- 'INTERFACEA' => array('sapphire\test\ClassF'),
- 'interfacea' => array('sapphire\test\ClassF'),
- 'SAPPHIRE\TEST\SUBTEST\INTERFACEA' => array('sapphire\test\ClassG'),
- 'sapphire\test\subtest\interfacea' => array('sapphire\test\ClassG'),
+ 'SILVERSTRIPE\TEST\INTERFACEA' => array('silverstripe\test\ClassE'),
+ 'silverstripe\test\interfacea' => array('silverstripe\test\ClassE'),
+ 'INTERFACEA' => array('silverstripe\test\ClassF'),
+ 'interfacea' => array('silverstripe\test\ClassF'),
+ 'SILVERSTRIPE\TEST\SUBTEST\INTERFACEA' => array('silverstripe\test\ClassG'),
+ 'silverstripe\test\subtest\interfacea' => array('silverstripe\test\ClassG'),
);
foreach ($expect as $interface => $impl) {
@@ -116,4 +116,4 @@ class NamespacedClassManifestTest extends SapphireTest {
$expect = array("module" => "{$this->base}/module");
$this->assertEquals($expect, $this->manifest->getModules());
}
-}
\ No newline at end of file
+}
diff --git a/tests/core/manifest/TokenisedRegularExpressionTest.php b/tests/core/manifest/TokenisedRegularExpressionTest.php
index eecf61c8e..ed6915889 100644
--- a/tests/core/manifest/TokenisedRegularExpressionTest.php
+++ b/tests/core/manifest/TokenisedRegularExpressionTest.php
@@ -56,7 +56,7 @@ PHP
return token_get_all(<<findAll($tokens);
$this->assertEquals(array(), $matches);
- $this->assertEquals(array('sapphire', '\\', 'test'), $namespacedMatches[0]['namespaceName']);
+ $this->assertEquals(array('silverstripe', '\\', 'test'), $namespacedMatches[0]['namespaceName']);
}
-}
\ No newline at end of file
+}
diff --git a/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassA.php b/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassA.php
index 47ecc7cf6..5269d913e 100644
--- a/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassA.php
+++ b/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassA.php
@@ -3,6 +3,6 @@
* @ignore
*/
-namespace sapphire\test;
+namespace silverstripe\test;
-class ClassA { }
\ No newline at end of file
+class ClassA { }
diff --git a/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassB.php b/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassB.php
index e3db093fb..1cd5a0dc4 100644
--- a/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassB.php
+++ b/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassB.php
@@ -3,6 +3,6 @@
* @ignore
*/
-namespace sapphire\test;
+namespace silverstripe\test;
-class ClassB extends ClassA { }
\ No newline at end of file
+class ClassB extends ClassA { }
diff --git a/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassC.php b/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassC.php
index 32fef9d97..c02b17449 100644
--- a/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassC.php
+++ b/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassC.php
@@ -3,6 +3,6 @@
* @ignore
*/
-namespace sapphire\test;
+namespace silverstripe\test;
-class ClassC extends \ClassA { }
\ No newline at end of file
+class ClassC extends \ClassA { }
diff --git a/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassD.php b/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassD.php
index 5acd35195..e8a3448a3 100644
--- a/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassD.php
+++ b/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassD.php
@@ -3,6 +3,6 @@
* @ignore
*/
-namespace sapphire\test;
+namespace silverstripe\test;
-class ClassD extends subtest\ClassC { }
\ No newline at end of file
+class ClassD extends subtest\ClassC { }
diff --git a/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassE.php b/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassE.php
index b9948a64d..8c6afcb30 100644
--- a/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassE.php
+++ b/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassE.php
@@ -3,6 +3,6 @@
* @ignore
*/
-namespace sapphire\test;
+namespace silverstripe\test;
-class ClassE implements InterfaceA { }
\ No newline at end of file
+class ClassE implements InterfaceA { }
diff --git a/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassF.php b/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassF.php
index 6c88f6258..c8ee33ce1 100644
--- a/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassF.php
+++ b/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassF.php
@@ -3,6 +3,6 @@
* @ignore
*/
-namespace sapphire\test;
+namespace silverstripe\test;
-class ClassF implements \InterfaceA { }
\ No newline at end of file
+class ClassF implements \InterfaceA { }
diff --git a/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassG.php b/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassG.php
index d878c25bb..b8b391d43 100644
--- a/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassG.php
+++ b/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassG.php
@@ -3,6 +3,6 @@
* @ignore
*/
-namespace sapphire\test;
+namespace silverstripe\test;
-class ClassG implements subtest\InterfaceA { }
\ No newline at end of file
+class ClassG implements subtest\InterfaceA { }
diff --git a/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassH.php b/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassH.php
index 17597aafb..6d8e2cdd2 100644
--- a/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassH.php
+++ b/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassH.php
@@ -3,6 +3,6 @@
* @ignore
*/
-namespace sapphire\test;
+namespace silverstripe\test;
-class ClassH extends \sapphire\test\ClassA { }
+class ClassH extends \silverstripe\test\ClassA { }
diff --git a/tests/core/manifest/fixtures/namespaced_classmanifest/module/interfaces/InterfaceA.php b/tests/core/manifest/fixtures/namespaced_classmanifest/module/interfaces/InterfaceA.php
index 7361ecaa9..137599726 100644
--- a/tests/core/manifest/fixtures/namespaced_classmanifest/module/interfaces/InterfaceA.php
+++ b/tests/core/manifest/fixtures/namespaced_classmanifest/module/interfaces/InterfaceA.php
@@ -3,6 +3,6 @@
* @ignore
*/
-namespace sapphire\test;
+namespace silverstripe\test;
-interface InterfaceA { }
\ No newline at end of file
+interface InterfaceA { }
diff --git a/tests/dev/CsvBulkLoaderTest.php b/tests/dev/CsvBulkLoaderTest.php
index 23a30bb39..d9b83e605 100644
--- a/tests/dev/CsvBulkLoaderTest.php
+++ b/tests/dev/CsvBulkLoaderTest.php
@@ -157,7 +157,7 @@ class CsvBulkLoaderTest extends SapphireTest {
$this->assertEquals($player->Biography, 'He\'s a good guy', 'test updating of duplicate imports within the same import works');
// load with updated data
- $filepath = Director::baseFolder() . '/sapphire/tests/dev/CsvBulkLoaderTest_PlayersWithIdUpdated.csv';
+ $filepath = FRAMEWORK_PATH . '/tests/dev/CsvBulkLoaderTest_PlayersWithIdUpdated.csv';
$results = $loader->load($filepath);
// HACK need to update the loaded record from the database
diff --git a/tests/dev/DeprecationTest.php b/tests/dev/DeprecationTest.php
index 7591cb21f..a9290fb35 100644
--- a/tests/dev/DeprecationTest.php
+++ b/tests/dev/DeprecationTest.php
@@ -53,7 +53,7 @@ class DeprecationTest extends SapphireTest {
function testNonMatchingModuleNotifcationVersionDoesntAffectNotice() {
Deprecation::notification_version('1.0.0');
Deprecation::notification_version('3.0.0', 'mysite');
- $this->callThatOriginatesFromSapphire();
+ $this->callThatOriginatesFromFramework();
}
/**
@@ -61,12 +61,12 @@ class DeprecationTest extends SapphireTest {
*/
function testMatchingModuleNotifcationVersionAffectsNotice() {
Deprecation::notification_version('1.0.0');
- Deprecation::notification_version('3.0.0', 'sapphire');
- $this->callThatOriginatesFromSapphire();
+ Deprecation::notification_version('3.0.0', 'framework');
+ $this->callThatOriginatesFromFramework();
}
- protected function callThatOriginatesFromSapphire() {
- $this->assertEquals(DeprecationTest_Deprecation::get_module(), 'sapphire');
+ protected function callThatOriginatesFromFramework() {
+ $this->assertEquals(DeprecationTest_Deprecation::get_module(), 'framework');
Deprecation::notice('2.0', 'Deprecation test passed');
}
diff --git a/tests/forms/LookupFieldTest.php b/tests/forms/LookupFieldTest.php
index a28a5bb2c..ded12ab30 100644
--- a/tests/forms/LookupFieldTest.php
+++ b/tests/forms/LookupFieldTest.php
@@ -6,7 +6,7 @@
class LookupFieldTest extends SapphireTest {
- static $fixture_file = 'sapphire/tests/forms/LookupFieldTest.yml';
+ static $fixture_file = 'LookupFieldTest.yml';
function testNullValueWithNumericArraySource() {
$source = array(1 => 'one', 2 => 'two', 3 => 'three');
@@ -79,4 +79,4 @@ class LookupFieldTest extends SapphireTest {
);
}
-}
\ No newline at end of file
+}
diff --git a/tests/forms/gridfield/GridFieldAddExistingAutocompleterTest.php b/tests/forms/gridfield/GridFieldAddExistingAutocompleterTest.php
index 0d0eecd30..567150190 100644
--- a/tests/forms/gridfield/GridFieldAddExistingAutocompleterTest.php
+++ b/tests/forms/gridfield/GridFieldAddExistingAutocompleterTest.php
@@ -1,7 +1,7 @@
DataDifferencerTest_MockImage.image1
- HasOneRelation: =>DataDifferencerTest_HasOneRelationObject.relobj1
\ No newline at end of file
+ HasOneRelation: =>DataDifferencerTest_HasOneRelationObject.relobj1
diff --git a/tests/salad/step_definitions/db-fixture.rb b/tests/salad/step_definitions/db-fixture.rb
deleted file mode 100644
index 5ee0f9220..000000000
--- a/tests/salad/step_definitions/db-fixture.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-def loadFixture(fileName)
- if $baseURL and $browser then
- $browser.goto $baseURL + "dev/tests/sessionloadyml?fixture=" + fileName + "&flush=1"
- else
- fail("No \$baseUrl or \$browser found")
- end
-end
-
-def startSession
- # Reset database
- if $baseURL and $browser then
- $browser.goto $baseURL + 'dev/tests/endsession'
- else
- fail("No \$baseUrl or \$browser found")
- end
- fileName = 'sapphire/tests/Bare.yml'
- if $baseURL and $browser then
- $browser.goto $baseURL + "dev/tests/startsession?fixture=" + fileName + "&flush=1"
- else
- fail("No \$baseUrl or \$browser found")
- end
-end
-
-Given /load the fixture file "([^"]+)"/ do |fileName|
- loadFixture(fileName)
-end
-
-startSession()
-
-Before do
- Given "I visit /dev/tests/emptydb?fixture=sapphire/tests/Bare.yml"
-end
\ No newline at end of file
diff --git a/tests/templates/RequirementsTest_Conditionals.ss b/tests/templates/RequirementsTest_Conditionals.ss
index 06c6bc2aa..488382151 100644
--- a/tests/templates/RequirementsTest_Conditionals.ss
+++ b/tests/templates/RequirementsTest_Conditionals.ss
@@ -1,9 +1,9 @@
-<% if FailTest %>
- <% require css(sapphire/tests/forms/RequirementsTest_a.css) %>
- <% require javascript(sapphire/tests/forms/RequirementsTest_b.js) %>
- <% require javascript(sapphire/tests/forms/RequirementsTest_c.js) %>
+<% if $FailTest %>
+ <% require css(framework/tests/forms/RequirementsTest_a.css) %>
+ <% require javascript(framework/tests/forms/RequirementsTest_b.js) %>
+ <% require javascript(framework/tests/forms/RequirementsTest_c.js) %>
<% else %>
- <% require javascript(sapphire/tests/forms/RequirementsTest_a.js) %>
- <% require css(sapphire/tests/forms/RequirementsTest_b.css) %>
- <% require css(sapphire/tests/forms/RequirementsTest_c.css) %>
+ <% require javascript(framework/tests/forms/RequirementsTest_a.js) %>
+ <% require css(framework/tests/forms/RequirementsTest_b.css) %>
+ <% require css(framework/tests/forms/RequirementsTest_c.css) %>
<% end_if %>
diff --git a/tests/testing/YamlFixtureTest.php b/tests/testing/YamlFixtureTest.php
index d2da8ba77..7943ad79b 100644
--- a/tests/testing/YamlFixtureTest.php
+++ b/tests/testing/YamlFixtureTest.php
@@ -10,13 +10,13 @@ class YamlFixtureTest extends SapphireTest {
);
function testAbsoluteFixturePath() {
- $absPath = Director::baseFolder() . '/sapphire/tests/testing/YamlFixtureTest.yml';
+ $absPath = FRAMEWORK_PATH . '/tests/testing/YamlFixtureTest.yml';
$obj = new YamlFixture($absPath);
$this->assertEquals($absPath, $obj->getFixtureFile());
}
function testRelativeFixturePath() {
- $relPath = 'sapphire/tests/testing/YamlFixtureTest.yml';
+ $relPath = FRAMEWORK_DIR . '/tests/testing/YamlFixtureTest.yml';
$obj = new YamlFixture($relPath);
$this->assertEquals(Director::baseFolder() . '/' . $relPath, $obj->getFixtureFile());
}
@@ -25,7 +25,7 @@ class YamlFixtureTest extends SapphireTest {
* @expectedException InvalidArgumentException
*/
function testFailsWithInvalidFixturePath() {
- $invalidPath = 'sapphire/tests/testing/invalid.yml';
+ $invalidPath = FRAMEWORK_DIR . '/tests/testing/invalid.yml';
$obj = new YamlFixture($invalidPath);
}
diff --git a/tests/view/SSViewerTest.php b/tests/view/SSViewerTest.php
index c54702ed5..d0ec3f89a 100644
--- a/tests/view/SSViewerTest.php
+++ b/tests/view/SSViewerTest.php
@@ -41,8 +41,8 @@ class SSViewerTest extends SapphireTest {
function testRequirements() {
$requirements = $this->getMock("Requirements_Backend", array("javascript", "css"));
- $jsFile = 'sapphire/tests/forms/a.js';
- $cssFile = 'sapphire/tests/forms/a.js';
+ $jsFile = FRAMEWORK_DIR . '/tests/forms/a.js';
+ $cssFile = FRAMEWORK_DIR . '/tests/forms/a.js';
$requirements->expects($this->once())->method('javascript')->with($jsFile);
$requirements->expects($this->once())->method('css')->with($cssFile);
@@ -943,10 +943,10 @@ after')
$result = $view->process($data);
$expected = '
-
+
-
+
';
$this->assertEquals($result, $expected);
@@ -954,14 +954,14 @@ after')
$data = new ArrayData(array());
$result = $view->process($data);
- $expected = '';
+ $expected = '';
$this->assertEquals($result, $expected);
$view = new SSViewer(array('SSViewerTestCommentsWithInclude'));
$data = new ArrayData(array());
$result = $view->process($data);
- $expected = '
Included
';
+ $expected = '
Included
';
$this->assertEquals($result, $expected);
SSViewer::set_source_file_comments(false);
diff --git a/thirdparty/behaviour/README.md b/thirdparty/behaviour/README.md
index e990137a5..aec2fc414 100644
--- a/thirdparty/behaviour/README.md
+++ b/thirdparty/behaviour/README.md
@@ -10,11 +10,11 @@ Caution: Seriously outdated, consider using [http://github.com/hafriedlander/jqu
# Requirements
- * Custom Prototype 1.4 RC3 (see `sapphire/thirdparty/prototype/prototype.js`)
+ * Custom Prototype 1.4 RC3 (see `framework/thirdparty/prototype/prototype.js`)
# Tutorial
-In Sapphire, I've tried to make Javascript development a lot more well-structured. It's very easy to write spaghetti, but this ultimately prevents maintainability. This page is a guide to better Javascript. (hopefully).
+In SilverStripe, I've tried to make Javascript development a lot more well-structured. It's very easy to write spaghetti, but this ultimately prevents maintainability. This page is a guide to better Javascript. (hopefully).
## Required includes
@@ -91,4 +91,4 @@ CAUTION: If you want to to have true instance-variables, specify them in initial
this.instanceVar = "current dom-id: " + this.id;
}
}
- Resizable.applyTo("div.multipleElements");
\ No newline at end of file
+ Resizable.applyTo("div.multipleElements");
diff --git a/thirdparty/prototype/prototype.js b/thirdparty/prototype/prototype.js
index a499541e0..b2f7a9041 100644
--- a/thirdparty/prototype/prototype.js
+++ b/thirdparty/prototype/prototype.js
@@ -830,7 +830,7 @@ Ajax.Request.prototype = Object.extend(new Ajax.Base(), {
// jquery ondemand integration patch
prototypeAjax = this;
completeHandler = function() {
- // Sapphire indication that the session has been lost
+ // SilverStripe indication that the session has been lost
if(prototypeAjax.transport.responseText && prototypeAjax.transport.responseText.substr(0,12) == 'NOTLOGGEDIN:') {
if(typeof onSessionLost == 'function') onSessionLost();
@@ -2108,4 +2108,4 @@ document.getParentOfElement = function( element, tagName, className ) {
}
return parent;
-}
\ No newline at end of file
+}
diff --git a/view/GenericTemplateGlobalProvider.php b/view/GenericTemplateGlobalProvider.php
new file mode 100644
index 000000000..b61d070f7
--- /dev/null
+++ b/view/GenericTemplateGlobalProvider.php
@@ -0,0 +1,33 @@
+combine_files);
}
-}
\ No newline at end of file
+}
diff --git a/view/SSTemplateParser.php.inc b/view/SSTemplateParser.php.inc
index b57c0b94a..bd5f18515 100644
--- a/view/SSTemplateParser.php.inc
+++ b/view/SSTemplateParser.php.inc
@@ -7,7 +7,7 @@ This is the uncompiled parser for the SilverStripe template language, PHP with s
It gets run through the php-peg parser compiler to have those comments turned into code that match parts of the template language,
producing the executable version SSTemplateParser.php
-To recompile after changing this file, run this from the 'sapphire/core' directory via command line:
+To recompile after changing this file, run this from the 'framework/core' directory via command line:
php ../thirdparty/php-peg/cli.php SSTemplateParser.php.inc > SSTemplateParser.php
diff --git a/view/TemplateGlobalProvider.php b/view/TemplateGlobalProvider.php
index f70856223..8a522c66b 100644
--- a/view/TemplateGlobalProvider.php
+++ b/view/TemplateGlobalProvider.php
@@ -32,4 +32,4 @@ interface TemplateGlobalProvider {
public static function get_template_global_variables();
}
-?>
\ No newline at end of file
+?>