Skip to content

Commit

Permalink
More UI docs, upgraded FubuMVC to fix package problems
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremydmiller committed Jun 9, 2015
1 parent f40fca0 commit 919b887
Show file tree
Hide file tree
Showing 7 changed files with 1,171 additions and 1,113 deletions.
19 changes: 19 additions & 0 deletions documentation/documentation/ui/shell.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ To clear any existing results in the specification editor and explorer views, us

The second navigation bar in light gray immediately below the navigation bar has links for the system status and help:

1. A link for "Save All Changes" appears if any specifications have local, unsaved changes.
1. The number of specifications in the execution queue. This link is not shown if the queue is empty.
1. A count of grammar errors with the specification language if there are any problems detected. See the section below on Grammar Errors.
1. A link for the status of the system under test. If the system is still being loaded or recycled, the text will read "Recycling" with a spinning icon. If the system is in a ready state, the link text will read something like "Recycled at [time]" telling you when the system was last loaded. Clicking this link will bring up the system properties modal window explained below.
1. _Search_ for a specfication or suite. More information below.
Expand Down Expand Up @@ -59,3 +61,20 @@ If there are any errors detected in the specification language when the system u
## Search for Specifications or Suites

Clicking the "Search" link in the status bar, or using the `ctrl+n` or `ctrl+shift+f` keyboard shortcuts, will bring up a modal dialog with a single typeahead textbox to search for a specification or suite by name. The functionality is patterned after IntelliJ/ReSharper's `ctrl-n` finder function.


## Queue Count and Execution Queue

Clicking the queue count link will open a new page just showing what specifications are executing and queued for execution. This page provides buttons to cancel specifications one by one or to cancel all the specifications in the queue.

## Progress Bar


<div class="alert alert-info" role="alert"><strong>Note!</strong> Creating a better look and feel for the progress bar would be an awesome pull request if anyone is interested;-)
</div>


If a specification is currently executing, a 3rd bar will be shown at the top of the page just below the status bar. The progress bar attempts to show the current progress of any running specification and a button to cancel the current specification.



66 changes: 65 additions & 1 deletion documentation/documentation/ui/spec-explorer.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,68 @@
<!--Title:The Specification Explorer-->
<!--Url:spec-explorer-->

TODO(Write some content!)
The "Specification Explorer" is the main view of the Storyteller specification editor and provides a pretty typical tree view of all the specifications in the project. The suite nodes in the specification explorer can be expanded or collapsed by clicking the <i class="fa fa-fw fa-caret-down" data-reactid=".0.1.$1af4afe3-a926-4abe-bd27-c3ae23409a5e.1.1:$Embedded.0.0.0"></i> or <i class="fa fa-fw fa-caret-down" data-reactid=".0.1.$1af4afe3-a926-4abe-bd27-c3ae23409a5e.1.1:$Embedded.0.0.0"></i> icons.

## Specification State

<div>
<table class="table">
<tbody>
<tr>
<th>Description</th>
<th>Display</th>
</tr>


<tr>
<td>No results, not running or queued</td>
<td></td>
</tr>
<tr>
<td>Last execution succeeded</td>
<td></td>
</tr>
<tr>
<td>Last execution failed</td>
<td></td>
</tr>
<tr>
<td>Queued</td>
<td></td>
</tr>
<tr>
<td>Running with no conclusive results</td>
<td></td>
</tr>
<tr>
<td>Running successfully</td>
<td></td>
</tr>
<tr>
<td>Running with failures</td>
<td></td>
</tr>
</tbody>
</table>
</div>


## Filtering

## Adding a new Top Level Suite

## Adding Child Suites

## Adding Specifications

## Cloning an Existing Specification

## Deleting Specifications

## Navigate to a Suite

## Running Specifications

## Navigating to a Specification


3 changes: 2 additions & 1 deletion documentation/layout.htm
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@
<[css:content/storyteller.css]>
<[css:content/prism.css]>
<[css:content/theme.css]>
<[css:content/font-awesome/font-awesome.min.css]>




<link rel="apple-touch-icon" href="/bootstrap/img/apple-touch-icon.png">
<link rel="apple-touch-icon" sizes="72x72" href="/bootstrap/img/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="114x114" href="/bootstrap/img/apple-touch-icon-114x114.png">

<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" />

<!-- CSS code from Bootply.com editor -->
<[css:content/affix.css]>
Expand Down
36 changes: 4 additions & 32 deletions paket.dependencies
Original file line number Diff line number Diff line change
@@ -1,44 +1,16 @@
source https://www.myget.org/F/fubumvc-edge
source http://nuget.org/api/v2
source https://www.myget.org/F/fubumvc-edge
source http://nuget.org/api/v2
source https://www.myget.org/F/fubumvc-edge
source http://nuget.org/api/v2
source https://www.myget.org/F/fubumvc-edge
source http://nuget.org/api/v2
source https://www.myget.org/F/fubumvc-edge
source http://nuget.org/api/v2
source https://www.myget.org/F/fubumvc-edge
source http://nuget.org/api/v2
source https://www.myget.org/F/fubumvc-edge
source http://nuget.org/api/v2
source https://www.myget.org/F/fubumvc-edge
source http://nuget.org/api/v2
source https://www.myget.org/F/fubumvc-edge
source http://nuget.org/api/v2
source https://www.myget.org/F/fubumvc-edge
source http://nuget.org/api/v2
source https://www.myget.org/F/fubumvc-edge
source http://nuget.org/api/v2
source https://www.myget.org/F/fubumvc-edge
source http://nuget.org/api/v2
source https://www.myget.org/F/fubumvc-edge
source http://nuget.org/api/v2
source https://www.myget.org/F/fubumvc-edge
source http://nuget.org/api/v2
source https://www.myget.org/F/fubumvc-edge


nuget CommonMark.NET
nuget Selenium.WebDriver
nuget Selenium.RC
nuget ilrepack
nuget FubuCore 2.0.0.291
nuget Bottles ~> 3.0
nuget FubuMVC.Core ~> 2.0.0.1912
nuget FubuMVC.Katana ~> 2.0.0.1912
nuget FubuMVC.StructureMap ~> 2.0.0.1912
source https://www.myget.org/F/fubumvc-edge
source http://nuget.org/api/v2
nuget FubuMVC.Core ~> 2.1
nuget FubuMVC.Katana ~> 2.1
nuget FubuMVC.StructureMap ~> 2.1
nuget Fixie
nuget HtmlTags 2.1.0.183
nuget Fleck 0.12.0.40
Expand Down
10 changes: 5 additions & 5 deletions paket.lock
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
NUGET
remote: https://www.myget.org/F/fubumvc-edge
specs:
Bottles (3.0.0.605)
Bottles (3.0.0.618)
FubuCore (>= 1.0.0.210)
FubuCore (2.0.0.291)
FubuMVC.Core (2.0.0.1912)
FubuMVC.Core (2.1.1.1963)
Bottles (>= 3.0.0.595)
FubuCore (>= 1.2.0.259)
HtmlTags (>= 1.1.0.114)
FubuMVC.Katana (2.0.0.1912)
FubuMVC.Katana (2.1.1.1963)
FubuMVC.Core
FubuMVC.StructureMap (2.0.0.1912)
FubuMVC.StructureMap (2.1.1.1963)
FubuMVC.Core
structuremap (>= 3.0.3.116)
remote: http://nuget.org/api/v2
Expand All @@ -26,7 +26,7 @@ NUGET
Selenium.RC (2.45.0)
Selenium.WebDriver (2.45.0)
Shouldly (2.4.0)
structuremap (3.1.4.143)
structuremap (3.1.5.154)
structuremap.automocking (3.1.0.133)
RhinoMocks (>= 3.6.1)
structuremap (>= 3.0.0)
7 changes: 5 additions & 2 deletions src/ST/Client/WebApplicationRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,12 @@ public void Start()

var container = new Container(new WebApplicationRegistry(_controller, context));

context.Start();
context.Start();

var registry = new FubuRegistry();
registry.AlterSettings<DiagnosticsSettings>(_ => _.TraceLevel = TraceLevel.Verbose);

_server = FubuApplication.DefaultPolicies().StructureMap(container).RunEmbeddedWithAutoPort();
_server = FubuApplication.For(registry).StructureMap(container).RunEmbeddedWithAutoPort();
}

public string BaseAddress
Expand Down
2,143 changes: 1,071 additions & 1,072 deletions stresults.htm

Large diffs are not rendered by default.

0 comments on commit 919b887

Please sign in to comment.