Skip to content

Commit 1aa0140

Browse files
committed
Use past tense in event names, see cucumber/cucumber-ruby#1166.
Rename events xStarting -> xStarted.
1 parent 4a9ca11 commit 1aa0140

File tree

5 files changed

+21
-20
lines changed

5 files changed

+21
-20
lines changed

HISTORY.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
### Bugfixes
55
### Removed Features
66
### Refactoring
7+
* Use past tense in event names (`xStarting` -> `xStarted`) (see [cucumber/cucumber-ruby#1166](https://github.com/cucumber/cucumber-ruby/issues/1166) @brasmusson).
78

89
## [3.0.0.pre.2](https://github.com/cucumber/cucumber-ruby-core/compare/v2.0.0...3.0.0.pre.2) (2017-07-26)
910

lib/cucumber/core/events.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ module Core
55
module Events
66

77
# Signals that a {Test::Case} is about to be executed
8-
class TestCaseStarting < Event.new(:test_case)
8+
class TestCaseStarted < Event.new(:test_case)
99

1010
# @return [Test::Case] the test case to be executed
1111
attr_reader :test_case
1212

1313
end
1414

1515
# Signals that a {Test::Step} is about to be executed
16-
class TestStepStarting < Event.new(:test_step)
16+
class TestStepStarted < Event.new(:test_step)
1717

1818
# @return [Test::Step] the test step to be executed
1919
attr_reader :test_step
@@ -47,8 +47,8 @@ class TestCaseFinished < Event.new(:test_case, :result)
4747
# that will be used by the {EventBus} by default.
4848
def self.registry
4949
build_registry(
50-
TestCaseStarting,
51-
TestStepStarting,
50+
TestCaseStarted,
51+
TestStepStarted,
5252
TestStepFinished,
5353
TestCaseFinished,
5454
)

lib/cucumber/core/test/runner.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ def initialize(event_bus)
1515
def test_case(test_case, &descend)
1616
@running_test_case = RunningTestCase.new
1717
@running_test_step = nil
18-
event_bus.test_case_starting(test_case)
18+
event_bus.test_case_started(test_case)
1919
descend.call(self)
2020
event_bus.test_case_finished(test_case, running_test_case.result)
2121
self
2222
end
2323

2424
def test_step(test_step)
2525
@running_test_step = test_step
26-
event_bus.test_step_starting test_step
26+
event_bus.test_step_started test_step
2727
step_result = running_test_case.execute(test_step)
2828
event_bus.test_step_finished test_step, step_result
2929
@running_test_step = nil

spec/cucumber/core/test/runner_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ module Cucumber::Core::Test
1919
let(:exception) { StandardError.new('test error') }
2020

2121
before do
22-
allow(event_bus).to receive(:test_case_starting)
22+
allow(event_bus).to receive(:test_case_started)
2323
allow(source).to receive(:location)
2424
end
2525

@@ -66,8 +66,8 @@ module Cucumber::Core::Test
6666
context "without steps" do
6767
let(:test_steps) { [] }
6868

69-
it "emits a test_case_starting event before running the test case" do
70-
expect(event_bus).to receive(:test_case_starting).with(test_case)
69+
it "emits a test_case_started event before running the test case" do
70+
expect(event_bus).to receive(:test_case_started).with(test_case)
7171
test_case.describe_to runner
7272
end
7373

spec/cucumber/core_spec.rb

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -99,17 +99,17 @@ module Cucumber
9999

100100
observed_events = []
101101
execute [gherkin], [Core::Test::Filters::ActivateStepsForSelfTest.new] do |event_bus|
102-
event_bus.on(:test_case_starting) do |event|
102+
event_bus.on(:test_case_started) do |event|
103103
test_case = event.test_case
104-
observed_events << [:test_case_starting, test_case.name]
104+
observed_events << [:test_case_started, test_case.name]
105105
end
106106
event_bus.on(:test_case_finished) do |event|
107107
test_case, result = *event.attributes
108108
observed_events << [:test_case_finished, test_case.name, result.to_sym]
109109
end
110-
event_bus.on(:test_step_starting) do |event|
110+
event_bus.on(:test_step_started) do |event|
111111
test_step = event.test_step
112-
observed_events << [:test_step_starting, test_step.name]
112+
observed_events << [:test_step_started, test_step.name]
113113
end
114114
event_bus.on(:test_step_finished) do |event|
115115
test_step, result = *event.attributes
@@ -118,18 +118,18 @@ module Cucumber
118118
end
119119

120120
expect(observed_events).to eq [
121-
[:test_case_starting, 'The one that passes'],
122-
[:test_step_starting, 'passing'],
121+
[:test_case_started, 'The one that passes'],
122+
[:test_step_started, 'passing'],
123123
[:test_step_finished, 'passing', :passed],
124124
[:test_case_finished, 'The one that passes', :passed],
125-
[:test_case_starting, 'The one that fails'],
126-
[:test_step_starting, 'passing'],
125+
[:test_case_started, 'The one that fails'],
126+
[:test_step_started, 'passing'],
127127
[:test_step_finished, 'passing', :passed],
128-
[:test_step_starting, 'failing'],
128+
[:test_step_started, 'failing'],
129129
[:test_step_finished, 'failing', :failed],
130-
[:test_step_starting, 'passing'],
130+
[:test_step_started, 'passing'],
131131
[:test_step_finished, 'passing', :skipped],
132-
[:test_step_starting, 'undefined'],
132+
[:test_step_started, 'undefined'],
133133
[:test_step_finished, 'undefined', :undefined],
134134
[:test_case_finished, 'The one that fails', :failed],
135135
]

0 commit comments

Comments
 (0)