From 1aa014041ff79d9940eafb87ee3657916027baa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Rasmusson?= Date: Wed, 2 Aug 2017 13:37:08 +0200 Subject: [PATCH] Use past tense in event names, see cucumber/cucumber-ruby#1166. Rename events xStarting -> xStarted. --- HISTORY.md | 1 + lib/cucumber/core/events.rb | 8 ++++---- lib/cucumber/core/test/runner.rb | 4 ++-- spec/cucumber/core/test/runner_spec.rb | 6 +++--- spec/cucumber/core_spec.rb | 22 +++++++++++----------- 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index e6875378..6132d38b 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -4,6 +4,7 @@ ### Bugfixes ### Removed Features ### Refactoring +* Use past tense in event names (`xStarting` -> `xStarted`) (see [cucumber/cucumber-ruby#1166](https://github.com/cucumber/cucumber-ruby/issues/1166) @brasmusson). ## [3.0.0.pre.2](https://github.com/cucumber/cucumber-ruby-core/compare/v2.0.0...3.0.0.pre.2) (2017-07-26) diff --git a/lib/cucumber/core/events.rb b/lib/cucumber/core/events.rb index 89b9a5d6..784fbd06 100644 --- a/lib/cucumber/core/events.rb +++ b/lib/cucumber/core/events.rb @@ -5,7 +5,7 @@ module Core module Events # Signals that a {Test::Case} is about to be executed - class TestCaseStarting < Event.new(:test_case) + class TestCaseStarted < Event.new(:test_case) # @return [Test::Case] the test case to be executed attr_reader :test_case @@ -13,7 +13,7 @@ class TestCaseStarting < Event.new(:test_case) end # Signals that a {Test::Step} is about to be executed - class TestStepStarting < Event.new(:test_step) + class TestStepStarted < Event.new(:test_step) # @return [Test::Step] the test step to be executed attr_reader :test_step @@ -47,8 +47,8 @@ class TestCaseFinished < Event.new(:test_case, :result) # that will be used by the {EventBus} by default. def self.registry build_registry( - TestCaseStarting, - TestStepStarting, + TestCaseStarted, + TestStepStarted, TestStepFinished, TestCaseFinished, ) diff --git a/lib/cucumber/core/test/runner.rb b/lib/cucumber/core/test/runner.rb index 8bd8599e..c527d3ed 100644 --- a/lib/cucumber/core/test/runner.rb +++ b/lib/cucumber/core/test/runner.rb @@ -15,7 +15,7 @@ def initialize(event_bus) def test_case(test_case, &descend) @running_test_case = RunningTestCase.new @running_test_step = nil - event_bus.test_case_starting(test_case) + event_bus.test_case_started(test_case) descend.call(self) event_bus.test_case_finished(test_case, running_test_case.result) self @@ -23,7 +23,7 @@ def test_case(test_case, &descend) def test_step(test_step) @running_test_step = test_step - event_bus.test_step_starting test_step + event_bus.test_step_started test_step step_result = running_test_case.execute(test_step) event_bus.test_step_finished test_step, step_result @running_test_step = nil diff --git a/spec/cucumber/core/test/runner_spec.rb b/spec/cucumber/core/test/runner_spec.rb index 53312d20..5f7121c7 100644 --- a/spec/cucumber/core/test/runner_spec.rb +++ b/spec/cucumber/core/test/runner_spec.rb @@ -19,7 +19,7 @@ module Cucumber::Core::Test let(:exception) { StandardError.new('test error') } before do - allow(event_bus).to receive(:test_case_starting) + allow(event_bus).to receive(:test_case_started) allow(source).to receive(:location) end @@ -66,8 +66,8 @@ module Cucumber::Core::Test context "without steps" do let(:test_steps) { [] } - it "emits a test_case_starting event before running the test case" do - expect(event_bus).to receive(:test_case_starting).with(test_case) + it "emits a test_case_started event before running the test case" do + expect(event_bus).to receive(:test_case_started).with(test_case) test_case.describe_to runner end diff --git a/spec/cucumber/core_spec.rb b/spec/cucumber/core_spec.rb index 14b34c97..517d599c 100644 --- a/spec/cucumber/core_spec.rb +++ b/spec/cucumber/core_spec.rb @@ -99,17 +99,17 @@ module Cucumber observed_events = [] execute [gherkin], [Core::Test::Filters::ActivateStepsForSelfTest.new] do |event_bus| - event_bus.on(:test_case_starting) do |event| + event_bus.on(:test_case_started) do |event| test_case = event.test_case - observed_events << [:test_case_starting, test_case.name] + observed_events << [:test_case_started, test_case.name] end event_bus.on(:test_case_finished) do |event| test_case, result = *event.attributes observed_events << [:test_case_finished, test_case.name, result.to_sym] end - event_bus.on(:test_step_starting) do |event| + event_bus.on(:test_step_started) do |event| test_step = event.test_step - observed_events << [:test_step_starting, test_step.name] + observed_events << [:test_step_started, test_step.name] end event_bus.on(:test_step_finished) do |event| test_step, result = *event.attributes @@ -118,18 +118,18 @@ module Cucumber end expect(observed_events).to eq [ - [:test_case_starting, 'The one that passes'], - [:test_step_starting, 'passing'], + [:test_case_started, 'The one that passes'], + [:test_step_started, 'passing'], [:test_step_finished, 'passing', :passed], [:test_case_finished, 'The one that passes', :passed], - [:test_case_starting, 'The one that fails'], - [:test_step_starting, 'passing'], + [:test_case_started, 'The one that fails'], + [:test_step_started, 'passing'], [:test_step_finished, 'passing', :passed], - [:test_step_starting, 'failing'], + [:test_step_started, 'failing'], [:test_step_finished, 'failing', :failed], - [:test_step_starting, 'passing'], + [:test_step_started, 'passing'], [:test_step_finished, 'passing', :skipped], - [:test_step_starting, 'undefined'], + [:test_step_started, 'undefined'], [:test_step_finished, 'undefined', :undefined], [:test_case_finished, 'The one that fails', :failed], ]