swiftrail 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e24f38ee1aae456dcb51651d88749efaddccd34333aedee76dbbc37324c9703
-  data.tar.gz: da2b976feeea24bad0767c2057ec9c21d5cf0c8add818a05e84ecabd590fc56f
+  metadata.gz: 24b9beb85d5c05e2b80e40dc6e5cfcc29c7d24571162d5003fb69f8bbb681937
+  data.tar.gz: 717bd96b5e4a2fd1b26e7d8a8e4c47da06aa297cd4fb41bef39826531cfe0189
 SHA512:
-  metadata.gz: 2acd8bcf1b0dd12fb3b979884da1ba12d8c19a5d0759ae926ef5c5b10acca8e8886eedee665e8604bb2e06a906c09b4eba59ddbf679a412ce04f2ad1cca5f63d
-  data.tar.gz: 30559bb2c5c062c575c3865f52893f8cf3732f2beaf9edf102763bdeb7fde64682bf9298dabadfb9af9d160b6e0efdfce4185fdc62ffb17f4893fdca526fd758
+  metadata.gz: ca865e1bd7b0174b409bdbecd6d285e201fd38e0c7ca63444842dacf169be5477fe66df85db5dcb67adba7e3d2060df8fef546619f02e5ad8c426db6fedba52f
+  data.tar.gz: 2a58d682fd847f8335a051998054198916d4e2694d3e9d66ce38097eb8703fb557ab1857aa1186802a41ff5203093f31e55f51b984f99c87538abf8dcd936202

data/README.md

@@ -20,16 +20,13 @@ $ bundle
 ### Options
 
 Mandatory options for all of the commands are
- 
+
 - `--test_classes=''` - regex for the path to swift tests
 - `--test_rail_username=''` - username for TestRail account
 - `--test_rail_password=''` - password for TestRail account
 - `--test_rail_url=''` -  url for TestRail account
 - `--run_id=''` - run_id for which you want to run the command
 
-When running report you additionaly have to pass location of the test_reports
-    - `--test-reports=''`
-
 ### Marking test cases
 
 In your `swift` projects you can mark any test class or specific test with any number of TestRail test cases. To mark them
@@ -67,14 +64,25 @@ class MyOtherTests: XCTestCase {
 ```
 ### Report
 
+When running report you additionaly have to pass location of the test_reports, and if you want strict mode
+- `--test-reports=''`
+- `--strict` (default is `false`)
+
 To be able to report the results of the tests, you need to first generate xml junit reports. Once you have those, running
 ```
 swiftrail report --test-reports='path/to/test/reports' --run_id:123 (all the other options should also be included)
 ```
 will report the results to TestRail. Dependent on success/failure the tests on TestRail will be marked accordingly.
 
+
+If the strict mode is enabled, the upload will fail if you have test cases that are not present in the test run.
+
 ### Coverage
 
+When running coverage you additionaly can pass output folder, where the report will be generated (if not passed it will print out to terminal)
+- `--output_folder=''`
+
+
 Coverage report will give you the percentage of test cases covered by your ui/unit/... tests.
 
 ```
@@ -83,6 +91,9 @@ swiftrail coverage --run_id:123 (all the other options should also be included)
 
 ### Lint
 
+When running lint you additionaly can pass output folder, where the report will be generated (if not passed it will print out to terminal)
+- `--output_folder=''`
+
 Lint will give you outadet case_ids that you have marked on your ui/unit tests, but no longer exist as test cases on TestRail.
 
 ```

data/lib/swiftrail/cli.rb

@@ -21,6 +21,7 @@ module Swiftrail
 
     desc 'report', 'Reports success/failure to test rail, based on the results of your tests'
     method_option :test_reports, type: :string, aliases: '-reports', default: defaults['reports'], desc: 'Regex to match your junit report files.'
+    method_option :strict, type: :boolean, aliases: '-strict', default: defaults['reports'], desc: 'Fail if there you are trying to report missing test case id'
     def report
       if swiftrail_reporter.report_results(options[:run_id])
         puts 'Successfully reported the results'
@@ -60,7 +61,8 @@ module Swiftrail
         [options['test_classes']],
         options['test_rail_username'],
         options['test_rail_password'],
-        options['test_rail_url']
+        options['test_rail_url'],
+        options['strict']
       )
     end
 

data/lib/swiftrail/config/reader.rb

@@ -18,6 +18,7 @@ module Swiftrail
       def base_defaults
         {
           reports: '',
+          strict: false,
           test_classes: '',
           test_rail_username: '',
           test_rail_password: '',

data/lib/swiftrail/swift/parser.rb

@@ -42,7 +42,7 @@ module Swiftrail
       end
 
       def cases_regex
-        %r{(//\s*TESTRAIL\s*([(C(0-9)*)|\s|,]*)$\s*)*(func |class )\s*(\w*)\s*(\(\)|:\s*XCTestCase)}im
+        %r{(//\s*TESTRAIL\s*([(C(0-9)*)|\s|,]*)$\s*)*^[\w ]*(func |class )\s*(\w*)\s*(\(\)|:\s*XCTestCase)}im
       end
 
       def sanitize(case_ids)

data/lib/swiftrail/testrail/api/test_rail_test.rb

@@ -1,16 +1,18 @@
 module Swiftrail
   module Testrail
     module Api
-      TestRailTest = Struct.new(:case_id, :id, :title) do
+      TestRailTest = Struct.new(:case_id, :id, :title, :automated) do
         def self.from_json(json)
-          TestRailTest.new(json['case_id'], json['id'], json['title'])
+          automated = json['custom_automated'] == 3 || json['custom_automated'] == 4
+          TestRailTest.new(json['case_id'], json['id'], json['title'], automated)
         end
 
         def to_json(*_args)
           {
             id: id,
             case_id: case_id,
-            title: title
+            title: title,
+            automated: automated
           }
         end
       end

data/lib/swiftrail/testrail/reporter.rb

@@ -6,30 +6,33 @@ require 'swiftrail/testrail/api/client'
 module Swiftrail
   module Testrail
     class Reporter
-      def initialize(test_report_patterns, tests_patterns, test_rail_username, test_rail_password, test_rail_base_url)
+      def initialize(test_report_patterns, tests_patterns, test_rail_username, test_rail_password, test_rail_base_url, strict)
         @test_report_patterns = test_report_patterns
         @tests_patterns = tests_patterns
         @test_rail_username = test_rail_username
         @test_rail_password = test_rail_password
         @test_rail_base_url = test_rail_base_url
+        @strict = strict
       end
 
       def report_results(run_id)
-        test_rail_client(run_id).publish_results(assembler(swift_test_parser.parse, junit_parser.parse).assemble)
+        test_rail_client(run_id).publish_results(purge(assembler(swift_test_parser.parse, junit_parser.parse).assemble, run_id))
       end
 
       private
 
-      attr_reader :test_report_patterns, :tests_patterns, :test_rail_username, :test_rail_password, :test_rail_base_url
-
-      def test_rail_client(run_id)
-        Api::Client.new(test_rail_base_url, test_rail_username, test_rail_password, run_id)
-      end
+      attr_reader :test_report_patterns, :tests_patterns, :test_rail_username, :test_rail_password, :test_rail_base_url, :strict
 
       def assembler(swift_tests, junit_test_suites)
         Assembler.new(swift_tests, junit_test_suites)
       end
 
+      def purge(test_cases, run_id)
+        test_cases.select do |test_case|
+          !strict || test_rail_test_cases(run_id).include?(test_case.case_id)
+        end
+      end
+
       def swift_test_parser
         Swiftrail::Swift::Parser.new(tests_patterns)
       end
@@ -37,6 +40,15 @@ module Swiftrail
       def junit_parser
         Swiftrail::Junit::Parser.new(test_report_patterns)
       end
+
+      def test_rail_test_cases(run_id)
+        @test_cases ||= test_rail_client(run_id).all_tests.map(&:case_id).map(&:to_s)
+      end
+
+      def test_rail_client(run_id)
+        Api::Client.new(test_rail_base_url, test_rail_username, test_rail_password, run_id)
+      end
+
     end
   end
 end

data/lib/swiftrail/version.rb

@@ -1,3 +1,3 @@
 module Swiftrail
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.1.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swiftrail
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Slavko Krucaj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-15 00:00:00.000000000 Z
+date: 2019-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri