Skip to content

Commit 78a3307

Browse files
dchelimskydchelimsky
committed
cukes
1 parent d9dc1fd commit 78a3307

20 files changed

+50
-50
lines changed

‎features/.nav‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
- GettingStarted.md (Getting started)
2-
- Upgrade.md
3-
- Generators.md (Rails generators)
1+
- GettingStarted.md (Start from scratch)
2+
- Upgrade.md (Upgrade from 1.x)
3+
- Generators.md (Generators)
44
- Autotest.md (Autotest integration)
55
- transactional_examples.feature
66
- model_specs:

‎features/controller_specs/README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ Controller specs live in `spec/controllers` or any example group with
22
`:type => :controller`.
33

44
A controller spec is an RSpec wrapper for a Rails functional test
5-
(ActionController::TestCase::Behavior). It allows you to simulate a single
6-
http request in each example, and then specify expected outcomes, including:
5+
([ActionController::TestCase::Behavior](https://github.com/rails/rails/blob/master/actionpack/lib/action_controller/test_case.rb)).
6+
It allows you to simulate a single http request in each example, and then
7+
specify expected outcomes such as:
78

89
* rendered templates
910
* redirects

‎features/controller_specs/anonymous_controller.feature‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Feature: anonymous controller
3737
end
3838
"""
3939
When I run "rspec spec"
40-
Then the output should contain "1 example, 0 failures"
40+
Then the examples should all pass
4141

4242
Scenario: specify error handling in subclass of ApplicationController
4343
Given a file named "spec/controllers/application_controller_subclass_spec.rb" with:
@@ -75,4 +75,4 @@ Feature: anonymous controller
7575
end
7676
"""
7777
When I run "rspec spec"
78-
Then the output should contain "1 example, 0 failures"
78+
Then the examples should all pass

‎features/controller_specs/isolation_from_views.feature‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Feature: views are stubbed by default
22

3-
By default, controller specs stub views with template that renders an empty
3+
By default, controller specs stub views with a template that renders an empty
44
string instead of the views in the app. This allows you specify which view
55
template an action should try to render regardless of whether the template
66
compiles cleanly.
@@ -28,7 +28,7 @@ Feature: views are stubbed by default
2828
end
2929
"""
3030
When I run "rspec ./spec"
31-
Then the output should contain "2 examples, 0 failures"
31+
Then the examples should all pass
3232

3333
Scenario: expect template that is not rendered by controller action (fails)
3434
Given a file named "spec/controllers/widgets_controller_spec.rb" with:

‎features/helper_specs/helper_spec.feature‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Feature: helper spec
2626
end
2727
"""
2828
When I run "rspec spec/helpers/application_helper_spec.rb"
29-
Then the output should contain "1 example, 0 failures"
29+
Then the examples should all pass
3030

3131
Scenario: helper method that accesses an instance variable
3232
Given a file named "spec/helpers/application_helper_spec.rb" with:
@@ -51,7 +51,7 @@ Feature: helper spec
5151
end
5252
"""
5353
When I run "rspec spec/helpers/application_helper_spec.rb"
54-
Then the output should contain "1 example, 0 failures"
54+
Then the examples should all pass
5555

5656
Scenario: application helper is included in helper object
5757
Given a file named "spec/helpers/widgets_helper_spec.rb" with:
@@ -84,4 +84,4 @@ Feature: helper spec
8484
end
8585
"""
8686
When I run "rspec spec/helpers/widgets_helper_spec.rb"
87-
Then the output should contain "1 example, 0 failures"
87+
Then the examples should all pass

‎features/mailer_specs/url_helpers.feature‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Feature: URL helpers in mailer examples
1616
end
1717
"""
1818
When I run "rspec spec"
19-
Then the output should contain "1 example, 0 failures"
19+
Then the examples should all pass
2020

2121
Scenario: using URL helpers without default options
2222
Given a file named "config/initializers/mailer_defaults.rb" with:
@@ -35,4 +35,4 @@ Feature: URL helpers in mailer examples
3535
end
3636
"""
3737
When I run "rspec spec"
38-
Then the output should contain "1 example, 0 failures"
38+
Then the examples should all pass

‎features/matchers/new_record_matcher.feature‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Feature: be_a_new matcher
2525
end
2626
"""
2727
When I run "rspec spec/models/widget_spec.rb"
28-
Then the output should contain "4 examples, 0 failures"
28+
Then the examples should all pass
2929

3030
Scenario: example spec using be_a_new.with
3131
Given a file named "spec/models/widget_spec.rb" with:
@@ -67,4 +67,4 @@ Feature: be_a_new matcher
6767
end
6868
"""
6969
When I run "rspec spec/models/widget_spec.rb"
70-
Then the output should contain "4 examples, 0 failures"
70+
Then the examples should all pass

‎features/matchers/redirect_to_matcher.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ Feature: redirect_to matcher
3737
end
3838
"""
3939
When I run "rspec spec/controllers/widgets_controller_spec.rb"
40-
Then the output should contain "4 examples, 0 failures"
40+
Then the examples should all pass

‎features/matchers/render_template_matcher.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ Feature: render_template matcher
2222
end
2323
"""
2424
When I run "rspec spec/controllers/gadgets_spec.rb"
25-
Then the output should contain "3 examples, 0 failures"
25+
Then the examples should all pass

‎features/mocks/mock_model.feature‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Feature: mock_model
3737
end
3838
"""
3939
When I run "rspec spec/models/car_spec.rb"
40-
Then the output should contain "3 examples, 0 failures"
40+
Then the examples should all pass
4141

4242
Scenario: passing a string that represents an existing constant
4343
Given a file named "spec/models/widget_spec.rb" with:
@@ -52,7 +52,7 @@ Feature: mock_model
5252
end
5353
"""
5454
When I run "rspec spec/models/widget_spec.rb"
55-
Then the output should contain "1 example, 0 failures"
55+
Then the examples should all pass
5656

5757
Scenario: passing a class that does not extend ActiveModel::Naming
5858
Given a file named "spec/models/string_spec.rb" with:
@@ -66,7 +66,7 @@ Feature: mock_model
6666
end
6767
"""
6868
When I run "rspec spec/models/string_spec.rb"
69-
Then the output should contain "1 example, 0 failures"
69+
Then the examples should all pass
7070

7171
Scenario: passing an Active Record constant
7272
Given a file named "spec/models/widget_spec.rb" with:
@@ -95,7 +95,7 @@ Feature: mock_model
9595
end
9696
"""
9797
When I run "rspec spec/models/widget_spec.rb"
98-
Then the output should contain "4 examples, 0 failures"
98+
Then the examples should all pass
9999

100100
Scenario: passing an Active Record constant with method stubs
101101
Given a file named "spec/models/widget_spec.rb" with:
@@ -128,4 +128,4 @@ Feature: mock_model
128128
end
129129
"""
130130
When I run "rspec spec/models/widget_spec.rb"
131-
Then the output should contain "3 examples, 0 failures"
131+
Then the examples should all pass

0 commit comments

Comments
 (0)