tonyair
/
silverstripe-testsession
mirror of https://github.com/silverstripe/silverstripe-testsession
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Better default styles, made form extensible

This commit is contained in:
Ingo Schommer 2013-12-10 16:50:23 +01:00
parent dca76e9ba3
commit c901abe83c
6 changed files with 133 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
code/TestSessionController.php
View File

@ -10,6 +10,7 @@ class TestSessionController extends Controller {
'set', 'set',
'end', 'end',
'clear', 'clear',
'Form',
); );
private static $alternative_database_name = -1; private static $alternative_database_name = -1;
@ -35,7 +36,7 @@ class TestSessionController extends Controller {
if(SapphireTest::using_temp_db()) return $this->renderWith('TestSession_inprogress'); if(SapphireTest::using_temp_db()) return $this->renderWith('TestSession_inprogress');
// Database // Database
$dbName = $request->getVar('database'); $dbName = $request->requestVar('database');
if($dbName) { if($dbName) {
$dbExists = (bool)DB::query( $dbExists = (bool)DB::query(
sprintf("SHOW DATABASES LIKE '%s'", Convert::raw2sql($dbName)) sprintf("SHOW DATABASES LIKE '%s'", Convert::raw2sql($dbName))
@ -51,13 +52,40 @@ class TestSessionController extends Controller {
$dbName = SapphireTest::create_temp_db(); $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); $this->extend('onAfterStart', $dbName);
return $this->renderWith('TestSession_start'); 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() { public function DatabaseName() {
// Workaround for bug in Cookie::get(), fixed in 3.1-rc1 // Workaround for bug in Cookie::get(), fixed in 3.1-rc1
if(self::$alternative_database_name != -1) { if(self::$alternative_database_name != -1) {
@ -78,9 +106,9 @@ class TestSessionController extends Controller {
); );
} }
$state = $request->getVars(); $params = $request->requestVars();
$this->extend('onBeforeSet', $state); $this->extend('onBeforeSet', $params);
$this->setState($data); $this->setState($params);
$this->extend('onAfterSet'); $this->extend('onAfterSet');
return $this->renderWith('TestSession_inprogress'); return $this->renderWith('TestSession_inprogress');
@ -158,6 +186,12 @@ class TestSessionController extends Controller {
} }
public function setState($data) { public function setState($data) {
// Filter keys
$data = array_diff_key(
$data,
array('action_set' => true, 'SecurityID' => true, 'url' => true)
);
// Database // Database
$dbname = (isset($data['database'])) ? $data['database'] : null; $dbname = (isset($data['database'])) ? $data['database'] : null;
if($dbname) { if($dbname) {
@ -203,6 +237,8 @@ class TestSessionController extends Controller {
$date = (isset($data['date'])) ? $data['date'] : null; $date = (isset($data['date'])) ? $data['date'] : null;
if($date) { if($date) {
require_once 'Zend/Date.php'; 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')) { if(!Zend_Date::isDate($date, 'yyyy-MM-dd HH:mm:ss')) {
throw new LogicException(sprintf( throw new LogicException(sprintf(
'Invalid date format "%s", use yyyy-MM-dd HH:mm:ss', 'Invalid date format "%s", use yyyy-MM-dd HH:mm:ss',

2
css/styles.css Normal file
View File

@ -0,0 +1,2 @@
input[name=fixture] {width: 400px;}
.datetime .middleColumn .field {overflow: auto;}

3
templates/Includes/TestSession_State.ss
View File

@ -7,4 +7,5 @@
<% end_loop %> <% end_loop %>
</ul> </ul>
</p> </p>
<% end_if %> <% end_if %>
$Form

35
templates/TestSession_end.ss
View File

@ -1,9 +1,26 @@
<p>Test session ended.</p> <!DOCTYPE html>
<ul> <html lang="en">
<li> <head>
<a id="home-link" href="$BaseHref">Return to your site</a> <meta charset="utf-8">
</li> <% base_tag %>
<li> $MetaTags
<a id="start-link" href="$Link(start)">Start a new test session</a> <% require css('framework/css/debug.css') %>
</li> <% require css('testsession/css/styles.css') %>
</ul> </head>
<body>
<div class="info">
<h1>SilverStripe TestSession</h1>
</div>
<div class="content">
<p>Test session ended.</p>
<ul>
<li>
<a id="home-link" href="$BaseHref">Return to your site</a>
</li>
<li>
<a id="start-link" href="$Link(start)">Start a new test session</a>
</li>
</ul>
</div>
</body>
</html>

29
templates/TestSession_inprogress.ss
View File

@ -1,5 +1,24 @@
<p> <!DOCTYPE html>
You're in the middle of a test session. <html lang="en">
<a id="end-session" href="$Link(end)">Click here to end it.</a> <head>
</p> <meta charset="utf-8">
<% include TestSession_State %> <% base_tag %>
$MetaTags
<% require css('framework/css/debug.css') %>
<% require css('testsession/css/styles.css') %>
</head>
<body>
<div class="info">
<h1>SilverStripe TestSession</h1>
</div>
<div class="content">
<p>
You're in the middle of a test session.
<a id="end-session" href="$Link(end)">Click here to end it.</a>
</p>
<% include TestSession_State %>
</div>
</body>
</html>

73
templates/TestSession_start.ss
View File

@ -1,35 +1,38 @@
<!-- SUCCESS: DBNAME=$DatabaseName --> <!DOCTYPE html>
<p> <html lang="en">
Started testing session. <head>
<% if Fixture %>Loaded fixture "$Fixture" into database.<% end_if %> <meta charset="utf-8">
Time to start testing; where would you like to start? <% base_tag %>
</p> $MetaTags
<ul> <% require css('framework/css/debug.css') %>
<li> <% require css('testsession/css/styles.css') %>
<a id="home-link" href="$BaseHref">Homepage - published site</a> </head>
</li> <body>
<li> <div class="info">
<a id="draft-link" href="$BaseHref/?stage=Stage">Homepage - draft site</a> <h1>SilverStripe TestSession</h1>
</li> </div>
<li> <div class="content">
<a id="admin-link" href="$BaseHref/admin/">CMS Admin</a> <!-- SUCCESS: DBNAME=$DatabaseName -->
</li> <p>
<li> Started testing session.
<a id="end-link" href="$Link(end)">End your test session</a> <% if Fixture %>Loaded fixture "$Fixture" into database.<% end_if %>
</li> Time to start testing; where would you like to start?
</ul> </p>
<% include TestSession_State %> <ul>
<form action="$Link(set)"> <li>
<p> <a id="home-link" href="$BaseHref">Homepage - published site</a>
Enter a fixture file name to add it to the test session. </li>
Don't forget to visit dev/testsession/end when you're done! <li>
</p> <a id="draft-link" href="$BaseHref/?stage=Stage">Homepage - draft site</a>
<p> </li>
Fixture file: <li>
<input id="fixture-file" name="fixture" /> <a id="admin-link" href="$BaseHref/admin/">CMS Admin</a>
</p> </li>
<input type="hidden" name="flush" value="1"> <li>
<p> <a id="end-link" href="$Link(end)">End your test session</a>
<input id="start-session" value="Start test session" type="submit" /> </li>
</p> </ul>
</form> <% include TestSession_State %>
</div>
</body>
</html>