rainforest-cli 1.10.3 → 1.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 404d70dc620de15e7e6eeb220d60a1809f722ee1
-  data.tar.gz: 9a23f6f532cb6cf9eaf6139868a876d020453392
+  metadata.gz: 192f7e0575ed3b8e2a790d514816f81a2cd98dfb
+  data.tar.gz: 11f021face63574272a30382144def1a06f7355f
 SHA512:
-  metadata.gz: 34ce70554f9807d0e2db16dd7c6eb58f5a219da7198b3c4db64dfa97ebd745585303ceac5c6f4bf501e45c2eb1bc0274fc023d73bd0642f35216ca65f5c3e38b
-  data.tar.gz: 10b6f5678629a9b9516ca2e6837e04569ffb79b61a35c97e2602073fff16f4f83372fb37debb9b3b82b30182846041ff88d27c1e2b184f7409409bc4424aee68
+  metadata.gz: b46770a727a8614482a68fe966a628ed814835c3b1c852658251d6d28b23597824ae2a1047bd2120e7bedb07338cfce45d906568830a15af54ef5c3c8873f488
+  data.tar.gz: 2f0628e2fdeca4061782b02016f59abceb81d6c69ae4f6632994b5ab13a7d87e1e4a8db66aef33ce817b2ccb581dedd3a647b624a8347279cadc2e16ed13cd6b

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Rainforest CLI Changelog
 
+## 1.10.4 - 31st October 2016
+- Do not upload test metadata as test description. (1c8b46d2156da17be939ac67edefe2bd2b56af47, @epaulet)
+
 ## 1.10.3 - 21st October 2016
 - Fix bug with accidental removal of 3 commands. (d9ebbd702ba1b1b64b9a1a222c301315b89d743e, @curtis-rainforestqa)
 - Add better tolerance for server errors. (b4180332ca13fec0972c3d65dbce00242907ca38, @epaulet)

data/lib/rainforest_cli/test_parser.rb

@@ -26,8 +26,7 @@ module RainforestCli::TestParser
       @test.browsers = []
     end
 
-    TEST_DATA_FIELDS = [:start_uri, :title, :site_id, :browsers].freeze
-    STEP_DATA_FIELDS = [:redirect].freeze
+    TEST_DATA_FIELDS = [:start_uri, :title, :site_id, :tags, :browsers].freeze
     CSV_FIELDS = [:tags, :browsers].freeze
 
     def process
@@ -37,32 +36,31 @@ module RainforestCli::TestParser
       text.lines.each_with_index do |line, line_no|
         line = line.chomp
         if line[0..1] == '#!'
-          # special comment, don't ignore!
           @test.rfml_id = line[2..-1].strip.split(' ')[0]
-          @test.description += line[1..-1] + "\n"
 
         elsif line[0] == '#'
-          # comment, store in description
-          @test.description += line[1..-1] + "\n"
+          comment = line[1..-1].strip
 
-          if line[1..-1].strip[0..8] == 'redirect:'
-            value = line[1..-1].split(' ')[1..-1].join(' ').strip
+          if comment.start_with?('redirect:')
+            value = comment.split(' ')[1..-1].join(' ').strip
             if %(true false).include?(value)
               step_settings_scratch[:redirect] = value
             else
               @test.errors[line_no] = Error.new(line_no, 'Redirection value must be true or false')
             end
-          end
-
-          (CSV_FIELDS + TEST_DATA_FIELDS).each do |field|
-            next unless line[1..-1].strip[0..(field.length)] == "#{field}:"
-
-            # extract just the text of the field
-            @test[field] = line[1..-1].split(' ')[1..-1].join(' ').strip
+          else
+            matched_field = TEST_DATA_FIELDS.find { |f| comment.start_with?("#{f}:") }
+            if matched_field.nil?
+              # comment, store in description
+              @test.description += comment + "\n"
+            else
+              # extract just the text of the field
+              @test[matched_field] = comment.split(' ')[1..-1].join(' ').strip
 
-            # if it's supposed to be a CSV field, split and trim it
-            if CSV_FIELDS.include?(field)
-              @test[field] = @test[field].split(',').map(&:strip).map(&:downcase)
+              # if it's supposed to be a CSV field, split and trim it
+              if CSV_FIELDS.include?(matched_field)
+                @test[matched_field] = @test[matched_field].split(',').map(&:strip).map(&:downcase)
+              end
             end
           end
 

data/lib/rainforest_cli/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module RainforestCli
-  VERSION = '1.10.3'
+  VERSION = '1.10.4'
 end

data/spec/rainforest-example/example_test.rfml

@@ -3,6 +3,9 @@
 # tags: foo,bar,baz
 # site_id: 456
 # start_uri: /start_uri
+# This is a comment
 
+# this is also a comment
+# redirect: false
 This is a step action.
 This is a question?

data/spec/rainforest_cli/test_parser_spec.rb

@@ -2,14 +2,35 @@
 describe RainforestCli::TestParser do
   describe RainforestCli::TestParser::Parser do
     subject { described_class.new(file_name) }
+    let(:file_name) { './spec/rainforest-example/example_test.rfml' }
 
     describe '#initialize' do
-      let(:file_name) { './spec/rainforest-example/example_test.rfml' }
-
       it 'expands the file name path' do
         test = subject.instance_variable_get(:@test)
         expect(test.file_name).to eq(File.expand_path(file_name))
       end
     end
+
+    describe '#process' do
+      let(:parsed_test) { subject.process }
+      let(:parsed_step) { parsed_test.steps.first }
+
+      describe 'parsing comments' do
+        it 'properly identifies comments' do
+          expect(parsed_test.description).to include('This is a comment', 'this is also a comment')
+        end
+
+        it 'properly identifies metadata fields' do
+          expect(parsed_test.title).to eq('Example Test')
+          expect(parsed_test.tags).to eq(['foo', 'bar', 'baz'])
+          expect(parsed_test.site_id).to eq('456')
+          expect(parsed_test.start_uri).to eq('/start_uri')
+        end
+
+        it 'properly parses step metadata' do
+          expect(parsed_step.redirect).to eq('false')
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rainforest-cli
 version: !ruby/object:Gem::Version
-  version: 1.10.3
+  version: 1.10.4
 platform: ruby
 authors:
 - Russell Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty