From c901abe83c2bc57c10a0d6d0aa45d3703118138f Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 10 Dec 2013 16:50:23 +0100 Subject: [PATCH] Better default styles, made form extensible --- code/TestSessionController.php | 46 ++++++++++++++-- css/styles.css | 2 + templates/Includes/TestSession_State.ss | 3 +- templates/TestSession_end.ss | 35 +++++++++--- templates/TestSession_inprogress.ss | 29 ++++++++-- templates/TestSession_start.ss | 73 +++++++++++++------------ 6 files changed, 133 insertions(+), 55 deletions(-) create mode 100644 css/styles.css diff --git a/code/TestSessionController.php b/code/TestSessionController.php index 8347824..4343a1e 100644 --- a/code/TestSessionController.php +++ b/code/TestSessionController.php @@ -10,6 +10,7 @@ class TestSessionController extends Controller { 'set', 'end', 'clear', + 'Form', ); private static $alternative_database_name = -1; @@ -35,7 +36,7 @@ class TestSessionController extends Controller { if(SapphireTest::using_temp_db()) return $this->renderWith('TestSession_inprogress'); // Database - $dbName = $request->getVar('database'); + $dbName = $request->requestVar('database'); if($dbName) { $dbExists = (bool)DB::query( sprintf("SHOW DATABASES LIKE '%s'", Convert::raw2sql($dbName)) @@ -51,13 +52,40 @@ class TestSessionController extends Controller { $dbName = SapphireTest::create_temp_db(); } - $this->setState(array_merge($request->getVars(), array('database' => $dbName))); + $this->setState(array_merge($request->requestVars(), array('database' => $dbName))); $this->extend('onAfterStart', $dbName); return $this->renderWith('TestSession_start'); } + public function Form() { + $form = new Form( + $this, + 'Form', + new FieldList( + (new TextField('fixture', 'Fixture YAML file path')) + ->setAttribute('placeholder', 'Example: framework/tests/security/MemberTest.yml'), + $datetimeField = new DatetimeField('date', 'Custom date'), + new HiddenField('flush', null, 1) + ), + new FieldList( + new FormAction('set', 'Set testing state') + ) + ); + $datetimeField->getDateField() + ->setConfig('dateformat', 'yyyy-MM-dd') + ->setConfig('showcalendar', true) + ->setAttribute('placeholder', 'Date'); + $datetimeField->getTimeField() + ->setAttribute('placeholder', 'Time'); + $form->setFormAction($this->Link('set')); + + $this->extend('updateForm', $form); + + return $form; + } + public function DatabaseName() { // Workaround for bug in Cookie::get(), fixed in 3.1-rc1 if(self::$alternative_database_name != -1) { @@ -78,9 +106,9 @@ class TestSessionController extends Controller { ); } - $state = $request->getVars(); - $this->extend('onBeforeSet', $state); - $this->setState($data); + $params = $request->requestVars(); + $this->extend('onBeforeSet', $params); + $this->setState($params); $this->extend('onAfterSet'); return $this->renderWith('TestSession_inprogress'); @@ -158,6 +186,12 @@ class TestSessionController extends Controller { } public function setState($data) { + // Filter keys + $data = array_diff_key( + $data, + array('action_set' => true, 'SecurityID' => true, 'url' => true) + ); + // Database $dbname = (isset($data['database'])) ? $data['database'] : null; if($dbname) { @@ -203,6 +237,8 @@ class TestSessionController extends Controller { $date = (isset($data['date'])) ? $data['date'] : null; if($date) { require_once 'Zend/Date.php'; + // Convert DatetimeField format + if(is_array($date)) $date = $date['date'] . ' ' . $date['time']; if(!Zend_Date::isDate($date, 'yyyy-MM-dd HH:mm:ss')) { throw new LogicException(sprintf( 'Invalid date format "%s", use yyyy-MM-dd HH:mm:ss', diff --git a/css/styles.css b/css/styles.css new file mode 100644 index 0000000..b799efb --- /dev/null +++ b/css/styles.css @@ -0,0 +1,2 @@ +input[name=fixture] {width: 400px;} +.datetime .middleColumn .field {overflow: auto;} \ No newline at end of file diff --git a/templates/Includes/TestSession_State.ss b/templates/Includes/TestSession_State.ss index 609e20f..5a4b6ac 100644 --- a/templates/Includes/TestSession_State.ss +++ b/templates/Includes/TestSession_State.ss @@ -7,4 +7,5 @@ <% end_loop %>

-<% end_if %> \ No newline at end of file +<% end_if %> +$Form \ No newline at end of file diff --git a/templates/TestSession_end.ss b/templates/TestSession_end.ss index 1b0d0ad..fcd77ed 100644 --- a/templates/TestSession_end.ss +++ b/templates/TestSession_end.ss @@ -1,9 +1,26 @@ -

Test session ended.

- \ No newline at end of file + + + + + <% base_tag %> + $MetaTags + <% require css('framework/css/debug.css') %> + <% require css('testsession/css/styles.css') %> + + +
+

SilverStripe TestSession

+
+
+

Test session ended.

+ +
+ + \ No newline at end of file diff --git a/templates/TestSession_inprogress.ss b/templates/TestSession_inprogress.ss index 5e78787..3f0af73 100644 --- a/templates/TestSession_inprogress.ss +++ b/templates/TestSession_inprogress.ss @@ -1,5 +1,24 @@ -

- You're in the middle of a test session. - Click here to end it. -

-<% include TestSession_State %> \ No newline at end of file + + + + + <% base_tag %> + $MetaTags + <% require css('framework/css/debug.css') %> + <% require css('testsession/css/styles.css') %> + + +
+

SilverStripe TestSession

+
+
+

+ You're in the middle of a test session. + Click here to end it. +

+ <% include TestSession_State %> +
+ + + + diff --git a/templates/TestSession_start.ss b/templates/TestSession_start.ss index 35f49f4..573ba3c 100644 --- a/templates/TestSession_start.ss +++ b/templates/TestSession_start.ss @@ -1,35 +1,38 @@ - -

- Started testing session. - <% if Fixture %>Loaded fixture "$Fixture" into database.<% end_if %> - Time to start testing; where would you like to start? -

- -<% include TestSession_State %> -
-

- Enter a fixture file name to add it to the test session. - Don't forget to visit dev/testsession/end when you're done! -

-

- Fixture file: - -

- -

- -

-
\ No newline at end of file + + + + + <% base_tag %> + $MetaTags + <% require css('framework/css/debug.css') %> + <% require css('testsession/css/styles.css') %> + + +
+

SilverStripe TestSession

+
+
+ +

+ Started testing session. + <% if Fixture %>Loaded fixture "$Fixture" into database.<% end_if %> + Time to start testing; where would you like to start? +

+ + <% include TestSession_State %> +
+ + \ No newline at end of file