Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "features/cucumber-tck"]
path = features/cucumber-tck
url = git://github.com/cucumber/cucumber-tck.git
url = https://github.com/konserw/cucumber-tck.git
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
source 'https://rubygems.org'

group :test do
gem 'cucumber', "=1.3.20"
gem 'aruba', "=0.6.1"
gem 'rspec', "=2.14.1"
gem 'cucumber', "=2.0.0"
gem 'aruba', "=0.8.0"
gem 'rspec', "=3.4.0"
end

2 changes: 1 addition & 1 deletion features/cucumber-tck
22 changes: 10 additions & 12 deletions features/step_definitions/cucumber_cpp_mappings.rb
Original file line number Diff line number Diff line change
Expand Up @@ -172,36 +172,34 @@ def assert_executed_scenarios *scenario_offsets
end

def assert_world_variable_held_value_at_time(value, time)
check_exact_file_content "#{WORLD_VARIABLE_LOG_FILE}.#{time}", value
expect(File.read("#{WORLD_VARIABLE_LOG_FILE}.#{time}")).to match value
end

def assert_world_function_called
check_file_presence [WORLD_FUNCTION_LOG_FILE], true
expect(File.file?(WORLD_FUNCTION_LOG_FILE)).to be true
end

def assert_cycle_sequence *args
expected_string = args.join CYCLE_SEQUENCE_SEPARATOR
check_file_content(CYCLE_LOG_FILE, expected_string, true)
expect(File.read(CYCLE_LOG_FILE)).to match expected_string
end

def assert_cycle_sequence_excluding *args
args.each do |unexpected_string|
check_file_content(CYCLE_LOG_FILE, unexpected_string, false)
expect(File.read(CYCLE_LOG_FILE)).not_to match unexpected_string
end
end

def assert_complete_cycle_sequence *args
expected_string = "#{CYCLE_SEQUENCE_SEPARATOR}#{args.join(CYCLE_SEQUENCE_SEPARATOR)}"
check_exact_file_content(CYCLE_LOG_FILE, expected_string)
expect(File.read(CYCLE_LOG_FILE)).to match expected_string
end

def assert_data_table_equals_json(json)
prep_for_fs_check do
log_file_contents = IO.read(DATA_TABLE_LOG_FILE)
actual_array = JSON.parse(log_file_contents)
expected_array = JSON.parse(json)
actual_array.should == expected_array
end
log_file_contents = File.read(DATA_TABLE_LOG_FILE)
actual_array = JSON.parse(log_file_contents)
expected_array = JSON.parse(json)
expect(actual_array).to be == expected_array
end

def run_feature
Expand Down Expand Up @@ -302,7 +300,7 @@ def write_main_step_definitions_file

def compile_step_definitions
compiler_output = %x[ #{COMPILE_STEP_DEFINITIONS_CMD} ]
expect($?.success?).to be_true, "Compilation failed!\n#{compiler_output}"
expect($?.success?).to be == true, "Compilation failed!\n#{compiler_output}"
end

def create_wire_file
Expand Down
1 change: 1 addition & 0 deletions travis.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/sh
set -e #break script on non-zero exitcode from any command
gem install gem-shut-the-fuck-up
gem install bundler
cmake -E make_directory build
cmake -E chdir build cmake -DCUKE_ENABLE_EXAMPLES=on -DGTEST_INCLUDE_DIR=/usr/src/gmock/gtest/include/ ..
Expand Down