Permalink
Browse files

Restructure the content/nav, but leave in place javascript redirects for

all the old pages.
  • Loading branch information...
1 parent 50d1f89 commit 9e31af14560ba50e014bdc44eb7a42b965616be7 @dchelimsky dchelimsky committed Oct 11, 2011
Showing with 150 additions and 65 deletions.
  1. +1 −1 content/community/index.page
  2. +3 −0 content/documentation/before_and_after.html
  3. +3 −0 content/documentation/changes-rspec.html
  4. +3 −0 content/documentation/expectations.html
  5. +3 −0 content/documentation/index.html
  6. +3 −0 content/documentation/mocks/index.html
  7. +3 −0 content/documentation/mocks/message_expectations.html
  8. +3 −0 content/documentation/mocks/other_frameworks.html
  9. +3 −0 content/documentation/mocks/partial_mocks.html
  10. +3 −0 content/documentation/mocks/stubs.html
  11. +3 −0 content/documentation/tools/extensions/editors/index.html
  12. +3 −0 content/documentation/tools/extensions/editors/textmate.html
  13. +3 −0 content/documentation/tools/extensions/index.html
  14. +3 −0 content/documentation/tools/heckle.html
  15. +3 −0 content/documentation/tools/index.html
  16. +3 −0 content/documentation/tools/rake.html
  17. +3 −0 content/documentation/tools/rcov.html
  18. +3 −0 content/documentation/tools/spec.html
  19. +3 −0 content/rails/changes-rspec-rails.html
  20. +3 −0 content/rails/generators.html
  21. +3 −0 content/rails/index.html
  22. +3 −0 content/rails/runners.html
  23. +3 −0 content/rails/writing/controllers.html
  24. +3 −0 content/rails/writing/helpers.html
  25. +3 −0 content/rails/writing/index.html
  26. +0 −42 content/rails/writing/index.page
  27. +3 −0 content/rails/writing/models.html
  28. +3 −0 content/rails/writing/views.html
  29. 0 content/{documentation/before_and_after.page → rspec-core/callbacks.page}
  30. 0 content/{documentation/changes-rspec.page → rspec-core/changelog.page}
  31. 0 content/{documentation → rspec-core}/index.page
  32. +1 −1 content/{documentation → rspec-core}/tools/extensions/editors/index.page
  33. +1 −1 content/{documentation → rspec-core}/tools/extensions/editors/textmate.page
  34. +1 −1 content/{documentation → rspec-core}/tools/extensions/index.page
  35. +1 −1 content/{documentation → rspec-core}/tools/heckle.page
  36. 0 content/{documentation → rspec-core}/tools/index.page
  37. +1 −1 content/{documentation → rspec-core}/tools/rake.page
  38. +1 −1 content/{documentation → rspec-core}/tools/rcov.page
  39. +1 −1 content/{documentation/tools/spec.page → rspec-core/tools/rspec-command.page}
  40. +8 −0 content/rspec-expectations/changelog.page
  41. 0 content/{documentation/expectations.page → rspec-expectations/index.page}
  42. +8 −0 content/rspec-mocks/changelog.page
  43. +1 −1 content/{documentation/mocks → rspec-mocks}/index.page
  44. +1 −1 content/{documentation/mocks/message_expectations.page → rspec-mocks/message-expectations.page}
  45. +1 −1 content/{documentation/mocks/stubs.page → rspec-mocks/method-stubs.page}
  46. +1 −1 content/{documentation/mocks/other_frameworks.page → rspec-mocks/other-frameworks.page}
  47. +2 −2 content/{documentation/mocks/partial_mocks.page → rspec-mocks/partial-mocks.page}
  48. +1 −1 content/{rails/changes-rspec-rails.page → rspec-rails/changelog.page}
  49. +1 −1 content/{rails/writing → rspec-rails}/controllers.page
  50. +2 −2 content/{rails → rspec-rails}/generators.page
  51. +1 −1 content/{rails/writing → rspec-rails}/helpers.page
  52. +34 −1 content/{rails → rspec-rails}/index.page
  53. +1 −1 content/{rails/writing → rspec-rails}/models.page
  54. +1 −1 content/{rails → rspec-rails}/runners.page
  55. +1 −1 content/{rails/writing → rspec-rails}/views.page
View
2 content/community/index.page
@@ -1,6 +1,6 @@
---
title: community
-order: 6
+order: 5
filter:
- erb
- textile
View
3 content/documentation/before_and_after.html
@@ -0,0 +1,3 @@
+<script language="javascript">
+ window.location = "/rspec-core/callbacks.html"
+</script>
View
3 content/documentation/changes-rspec.html
@@ -0,0 +1,3 @@
+<script language="javascript">
+ window.location = "/rspec-core/changelog.html"
+</script>
View
3 content/documentation/expectations.html
@@ -0,0 +1,3 @@
+<script language="javascript">
+ window.location = "/rspec-expectations/"
+</script>
View
3 content/documentation/index.html
@@ -0,0 +1,3 @@
+<script language="javascript">
+ window.location = "/rspec-core/"
+</script>
View
3 content/documentation/mocks/index.html
@@ -0,0 +1,3 @@
+<script language="javascript">
+ window.location = "/rspec-mocks/"
+</script>
View
3 content/documentation/mocks/message_expectations.html
@@ -0,0 +1,3 @@
+<script language="javascript">
+ window.location = "/rspec-mocks/message-expectations.html"
+</script>
View
3 content/documentation/mocks/other_frameworks.html
@@ -0,0 +1,3 @@
+<script language="javascript">
+ window.location = "/rspec-mocks/other-frameworks.html"
+</script>
View
3 content/documentation/mocks/partial_mocks.html
@@ -0,0 +1,3 @@
+<script language="javascript">
+ window.location = "/rspec-mocks/partial-mocks.html"
+</script>
View
3 content/documentation/mocks/stubs.html
@@ -0,0 +1,3 @@
+<script language="javascript">
+ window.location = "/rspec-mocks/method-stubs.html"
+</script>
View
3 content/documentation/tools/extensions/editors/index.html
@@ -0,0 +1,3 @@
+<script language="javascript">
+ window.location = "/rspec-core/tools/extensions/editors"
+</script>
View
3 content/documentation/tools/extensions/editors/textmate.html
@@ -0,0 +1,3 @@
+<script language="javascript">
+ window.location = "/rspec-core/tools/extensions/textmate.html"
+</script>
View
3 content/documentation/tools/extensions/index.html
@@ -0,0 +1,3 @@
+<script language="javascript">
+ window.location = "/rspec-core/tools/extensions/"
+</script>
View
3 content/documentation/tools/heckle.html
@@ -0,0 +1,3 @@
+<script language="javascript">
+ window.location = "/rspec-core/tools/heckle.html"
+</script>
View
3 content/documentation/tools/index.html
@@ -0,0 +1,3 @@
+<script language="javascript">
+ window.location = "/rspec-core/tools/"
+</script>
View
3 content/documentation/tools/rake.html
@@ -0,0 +1,3 @@
+<script language="javascript">
+ window.location = "/rspec-core/tools/rake.html"
+</script>
View
3 content/documentation/tools/rcov.html
@@ -0,0 +1,3 @@
+<script language="javascript">
+ window.location = "/rspec-core/tools/rcov.html"
+</script>
View
3 content/documentation/tools/spec.html
@@ -0,0 +1,3 @@
+<script language="javascript">
+ window.location = "/rspec-core/tools/rspec-command.html.html"
+</script>
View
3 content/rails/changes-rspec-rails.html
@@ -0,0 +1,3 @@
+<script language="javascript">
+ window.location = "/rspec-rails/changelog.html"
+</script>
View
3 content/rails/generators.html
@@ -0,0 +1,3 @@
+<script language="javascript">
+ window.location = "/rspec-rails/generators.html"
+</script>
View
3 content/rails/index.html
@@ -0,0 +1,3 @@
+<script language="javascript">
+ window.location = "/rspec-rails/"
+</script>
View
3 content/rails/runners.html
@@ -0,0 +1,3 @@
+<script language="javascript">
+ window.location = "/rspec-rails/runners.html"
+</script>
View
3 content/rails/writing/controllers.html
@@ -0,0 +1,3 @@
+<script language="javascript">
+ window.location = "/rspec-rails/controllers.html"
+</script>
View
3 content/rails/writing/helpers.html
@@ -0,0 +1,3 @@
+<script language="javascript">
+ window.location = "/rspec-rails/helpers.html"
+</script>
View
3 content/rails/writing/index.html
@@ -0,0 +1,3 @@
+<script language="javascript">
+ window.location = "/rspec-rails/"
+</script>
View
42 content/rails/writing/index.page
@@ -1,42 +0,0 @@
----
-title: Writing
-order: 2
-filter:
- - erb
- - textile
----
-
-h2. Introduction to Writing Examples using Spec::Rails
-
-Spec::Rails supports 4 different types of Executable Examples:
-
-* "Model Examples":models.html
-* "View Examples":views.html
-* "Controller Examples":controllers.html
-* "Helper Examples":helpers.html
-
-Each of these use specialized ExampleGroup subclasses to give you access to
-the appropriate services and methods. The specific type of ExampleGroup is
-determined implicitly by placing the examples in an appropriately named file
-(*_spec.rb) within an appropriately named directory:
-
-<pre>
-spec/controllers/**/*_spec.rb
-spec/helpers/**/*_spec.rb
-spec/models/**/*_spec.rb
-spec/views/**/*_spec.rb
-</pre>
-
-%{color:red;font-weight:bold}WARNING:% If you do not follow these conventions,
-you will not get the correct ExampleGroup subclass. If you prefer to disregard
-this convention, you can get the correct ExampleGroup subclass by passing a
-hash to the describe method:
-
-<% coderay do -%>
-describe "some model", :type => :model do
- ...
-end
-<% end -%>
-
-This works with <code>:model, :view, :controller and :helper</code>.
-
View
3 content/rails/writing/models.html
@@ -0,0 +1,3 @@
+<script language="javascript">
+ window.location = "/rspec-rails/models.html"
+</script>
View
3 content/rails/writing/views.html
@@ -0,0 +1,3 @@
+<script language="javascript">
+ window.location = "/rspec-rails/views.html"
+</script>
View
0 content/documentation/before_and_after.page → content/rspec-core/callbacks.page
File renamed without changes.
View
0 content/documentation/changes-rspec.page → content/rspec-core/changelog.page
File renamed without changes.
View
0 content/documentation/index.page → content/rspec-core/index.page
File renamed without changes.
View
2 ...ation/tools/extensions/editors/index.page → ...-core/tools/extensions/editors/index.page
@@ -1,5 +1,5 @@
---
-title: Editors
+title: editors
order: 1
filter:
- erb
View
2 ...on/tools/extensions/editors/textmate.page → ...re/tools/extensions/editors/textmate.page
@@ -1,5 +1,5 @@
---
-title: TextMate
+title: textmate
order: 1
filter:
- erb
View
2 ...documentation/tools/extensions/index.page → ...nt/rspec-core/tools/extensions/index.page
@@ -1,5 +1,5 @@
---
-title: Extensions
+title: extensions
order: 5
filter:
- erb
View
2 content/documentation/tools/heckle.page → content/rspec-core/tools/heckle.page
@@ -1,5 +1,5 @@
---
-title: Heckle
+title: heckle
order: 4
filter:
- erb
View
0 content/documentation/tools/index.page → content/rspec-core/tools/index.page
File renamed without changes.
View
2 content/documentation/tools/rake.page → content/rspec-core/tools/rake.page
@@ -1,5 +1,5 @@
---
-title: Rake Tasks
+title: rake
order: 2
filter:
- erb
View
2 content/documentation/tools/rcov.page → content/rspec-core/tools/rcov.page
@@ -1,5 +1,5 @@
---
-title: RCov
+title: rcov
order: 3
filter:
- erb
View
2 content/documentation/tools/spec.page → content/rspec-core/tools/rspec-command.page
@@ -1,5 +1,5 @@
---
-title: Command Line
+title: rspec command
order: 1
filter:
- erb
View
8 content/rspec-expectations/changelog.page
@@ -0,0 +1,8 @@
+---
+title: changelog
+order: 5
+filter:
+ - erb
+ - textile
+---
+<pre><%= IO.read '../rspec-expectations/Changelog.md' %></pre>
View
0 content/documentation/expectations.page → content/rspec-expectations/index.page
File renamed without changes.
View
8 content/rspec-mocks/changelog.page
@@ -0,0 +1,8 @@
+---
+title: changelog
+order: 5
+filter:
+ - erb
+ - textile
+---
+<pre><%= IO.read '../rspec-mocks/Changelog.md' %></pre>
View
2 content/documentation/mocks/index.page → content/rspec-mocks/index.page
@@ -1,6 +1,6 @@
---
title: rspec-mocks
-order: 4
+order: 3
filter:
- erb
- textile
View
2 ...mentation/mocks/message_expectations.page → ...ent/rspec-mocks/message-expectations.page
@@ -1,5 +1,5 @@
---
-title: Message Expectations
+title: message expectations
order: 1
filter:
- erb
View
2 content/documentation/mocks/stubs.page → content/rspec-mocks/method-stubs.page
@@ -1,5 +1,5 @@
---
-title: Method Stubs
+title: method stubs
order: 2
filter:
- erb
View
2 ...documentation/mocks/other_frameworks.page → content/rspec-mocks/other-frameworks.page
@@ -1,5 +1,5 @@
---
-title: Other Mock/Stub Frameworks
+title: other frameworks
order: 4
filter:
- erb
View
4 ...nt/documentation/mocks/partial_mocks.page → content/rspec-mocks/partial-mocks.page
@@ -1,5 +1,5 @@
---
-title: Mock Object behaviour on Real Objects
+title: partial mocks
order: 3
filter:
- erb
@@ -18,4 +18,4 @@ MyModel.should_receive(:find).with(id).and_return(@mock_model_instance)
Controlling the behaviour of the class level methods (for example, having them return a mock object instead of a real instance of the model class) allows you to describe your controllers and views in isolation from the instance level logic of your model classes. This means that you can change the validation rules for a model, for example, and drive that in the model examples without affecting the controller and view examples.
-This also helps to keep the context of your example completely in view (no having to look at fixtures/xyz.yml to understand what's going on).
+This also helps to keep the context of your example completely in view (no having to look at fixtures/xyz.yml to understand what's going on).
View
2 content/rails/changes-rspec-rails.page → content/rspec-rails/changelog.page
@@ -1,5 +1,5 @@
---
-title: Changelog
+title: changelog
order: 5
filter:
- erb
View
2 content/rails/writing/controllers.page → content/rspec-rails/controllers.page
@@ -1,5 +1,5 @@
---
-title: Controllers
+title: controllers
order: 3
filter:
- erb
View
4 content/rails/generators.page → content/rspec-rails/generators.page
@@ -1,5 +1,5 @@
---
-title: Generators
+title: generators
order: 3
filter:
- erb
@@ -28,4 +28,4 @@ or
ruby script/generate rspec_controller person
</pre>
-For more information on each generator, just run them without any arguments.
+For more information on each generator, just run them without any arguments.
View
2 content/rails/writing/helpers.page → content/rspec-rails/helpers.page
@@ -1,5 +1,5 @@
---
-title: Helpers
+title: helpers
order: 4
filter:
- erb
View
35 content/rails/index.page → content/rspec-rails/index.page
@@ -1,6 +1,6 @@
---
title: rspec-rails
-order: 2
+order: 4
filter:
- erb
- textile
@@ -88,3 +88,36 @@ project
The Rake tasks are named accordingly.
+h2. Introduction to Writing Examples using Spec::Rails
+
+Spec::Rails supports 4 different types of Executable Examples:
+
+* "Model Examples":models.html
+* "View Examples":views.html
+* "Controller Examples":controllers.html
+* "Helper Examples":helpers.html
+
+Each of these use specialized ExampleGroup subclasses to give you access to
+the appropriate services and methods. The specific type of ExampleGroup is
+determined implicitly by placing the examples in an appropriately named file
+(*_spec.rb) within an appropriately named directory:
+
+<pre>
+spec/controllers/**/*_spec.rb
+spec/helpers/**/*_spec.rb
+spec/models/**/*_spec.rb
+spec/views/**/*_spec.rb
+</pre>
+
+%{color:red;font-weight:bold}WARNING:% If you do not follow these conventions,
+you will not get the correct ExampleGroup subclass. If you prefer to disregard
+this convention, you can get the correct ExampleGroup subclass by passing a
+hash to the describe method:
+
+<% coderay do -%>
+describe "some model", :type => :model do
+ ...
+end
+<% end -%>
+
+This works with <code>:model, :view, :controller and :helper</code>.
View
2 content/rails/writing/models.page → content/rspec-rails/models.page
@@ -1,5 +1,5 @@
---
-title: Models
+title: models
order: 1
filter:
- erb
View
2 content/rails/runners.page → content/rspec-rails/runners.page
@@ -1,5 +1,5 @@
---
-title: Runners
+title: runners
order: 4
filter:
- erb
View
2 content/rails/writing/views.page → content/rspec-rails/views.page
@@ -1,5 +1,5 @@
---
-title: Views
+title: views
order: 2
filter:
- erb

0 comments on commit 9e31af1

Please sign in to comment.