Skip to content
Merged
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
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
Submodule cucumber-tck updated from 7ea914 to 11d637
24 changes: 11 additions & 13 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("#{WORLD_VARIABLE_LOG_FILE}.#{time}").to have_file_content(value)
end

def assert_world_function_called
check_file_presence [WORLD_FUNCTION_LOG_FILE], true
expect(WORLD_FUNCTION_LOG_FILE).to be_an_existing_file
end

def assert_cycle_sequence *args
expected_string = args.join CYCLE_SEQUENCE_SEPARATOR
check_file_content(CYCLE_LOG_FILE, expected_string, true)
expect(CYCLE_LOG_FILE).to have_file_content(Regexp.new expected_string)
end

def assert_cycle_sequence_excluding *args
args.each do |unexpected_string|
check_file_content(CYCLE_LOG_FILE, unexpected_string, false)
expect(CYCLE_LOG_FILE).not_to have_file_content(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(CYCLE_LOG_FILE).to have_file_content(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 = IO.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,11 +300,11 @@ def write_main_step_definitions_file
def compile_step_definitions
remove_step_definition_obj
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 remove_step_definition_obj
remove_file STEP_DEFINITIONS_OBJ
remove STEP_DEFINITIONS_OBJ
rescue Errno::ENOENT
end

Expand Down