Fix count test

features/runner/test_audit_stream.rb

@@ -8,9 +8,10 @@ def write_line(s)
   end
 
   def get_log
-    total = @total
-    puts total
+    @total
+  end
+
+  def clear
     @total = ''
-    total
   end
 end

features/runner/wiremock_process.rb

@@ -46,10 +46,11 @@ def count_requests_with_endpoint(endpoint, verb, body)
     }
 
     if body
-      request_json['bodyPatterns'] = [{equalTo: body}]
+      request_json[:bodyPatterns] = [{equalTo: body}]
     end
 
-    RestClient.post("#{@base_url}/__admin/requests/count", request_json)
+    response = RestClient.post("#{@base_url}/__admin/requests/count", request_json.to_json, {content_type: :json, accept: :json})
+    JSON.parse(response.body)["count"]
   end
 
 end

features/runner_steps.rb

@@ -77,6 +77,8 @@
 end
 
 When(/^user starts client$/) do
+  audit_stream.clear
+
   config = TDL::ChallengeSessionConfig.for_journey_id(@journey_id)
     .with_server_hostname(@challenge_hostname)
     .with_port(@port)
@@ -92,10 +94,13 @@
 end
 
 Then(/^the server interaction should contain the following lines:$/) do |expected_output|
-  total = audit_stream.get_log
-  lines = expected_output.split('\n')
+  total = audit_stream.get_log.strip
+  lines = expected_output.split("\n")
   lines.each do |line|
-    assert total.include?(line), 'Expected string is not contained in output'
+    line = line.strip
+    unless line.empty?
+      assert total.include?(line), 'Expected string is not contained in output'
+    end
   end
 end
 

lib/tdl/runner/challenge_server_client.rb

@@ -7,6 +7,7 @@ def initialize(hostname, port, journey_id, use_colours)
     end
 
     def get_journey_progress
+      puts @base_url
       get('journeyProgress')
     end