rainforest-cli 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e73f6818b72f61f2b152943bc46f066b95c43630
-  data.tar.gz: a5a82d24cf2b5d5d4be4fafe0c3a0ebab1cca626
+  metadata.gz: 913823c8a483a43079a1d4847066e83790b00a77
+  data.tar.gz: 9fca3e86e02723dfb7d405b4866182948dc89f1d
 SHA512:
-  metadata.gz: add946c11dd743c5fb9796d00a12526c87a7453bfe52341a28272d22ae0fb05458b95bf2cb52080623a67d17bc1318a09db75a2c96c9d94ec4041b0724e48da5
-  data.tar.gz: 712af1181c2892308dd5396c63653f0e61e5944ad74044788589326258e74b3075cf40a93a672e5c19dabe7d38fba7328d43fe85b7630683c2ee9542dad183e2
+  metadata.gz: de68e1c0a84cceb73a6b5b800cc36b138722a5085f415035eded818e42a24b53e63edfd043242a16dc22e0aceffd4752e2c8b265237113b8fde7a63c9318fdbd
+  data.tar.gz: 4bd09d4ef56dc31c0364a383636418b8cfc6680ef445ad8f2e1ff48fb0b77b45b8ad953c295f77952fca8acf5ed1baabf110b15d0437561fb35b815e8e08744b

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Rainforest CLI Changelog
 
+## 1.8.0 - 19th August 2016
+- Filter RFML test downloads with `rainforest export` using `--tag`, `--folder`, and `--site-id` flags.
+(5826000fddeb152dc1e2c8ad4baf04cdc0dd2001, @epaulet)
+
 ## 1.7.0 - 8th August 2016
 - New run flag: `--wait` for hooking into existing run instead of starting a new one.
 (77df41bf79b8635fb8c2d8a93968f975db092c69, @shosti)

data/README.md

@@ -100,6 +100,12 @@ Export all tests from Rainforest
 rainforest export
 ```
 
+Export tests filtered by tags, site, and smart folder
+
+```bash
+rainforest export --tag foo --tag bar --site-id 123 --folder 456
+```
+
 #### Viewing Account Specific Information
 
 See a list of all of your sites and their IDs
@@ -182,12 +188,8 @@ tests and the first step of a test.
 - `EMBEDDED TEST RFML ID` - Embed the steps of another test within the current test
 using the embedded test's RFML ID.
 
-Embedding Screenshots and Downloadable Files:
-- Your embedded files must be checked into version control with along your RFML tests.
-- `{{ file.screenshot(RELATIVE_PATH) }}` will embed screenshot found at RELATIVE_PATH
-which is a path to the screenshot relative to the RFML file.
-- `{{ file.download(RELATIVE_PATH) }}` will embed downloadable file link found at RELATIVE_PATH
-which is a path to the downloadable file relative to the RFML file.
+For more information on embedding inline screenshots and file downloads,
+[see our examples](./examples/inline_files.md)
 
 For more information on test writing, please visit our [documentation](http://support.rainforestqa.com/hc/en-us/sections/200585603-Writing-Tests).
 
@@ -195,9 +197,9 @@ For more information on test writing, please visit our [documentation](http://su
 
 Popular command line options are:
 - `--browsers ie8` or `--browsers ie8,chrome` - specify the browsers you wish to run against. This overrides the test own settings. Valid browsers can be found in your account settings.
-- `--tag run-me` - only run tests which have this tag (recommended if you have lots of [test-steps](http://docs.rainforestqa.com/pages/example-test-suite.html#test_steps))!)
-- `--site-id` - only run tests for a specific site. Get in touch with us for help on getting that you site id if you are unable to.
-- `--folder ID` - run tests in specified folder.
+- `--tag TAG_NAME` - filter tests by tag. Can be used multiple times for filtering by multiple tags.
+- `--site-id SITE_ID` - filter tests by a specific site. You can see a list of your site IDs with `rainforest sites`.
+- `--folder ID` - filter tests in specified folder.
 - `--environment-id` - run your tests using this environment. Otherwise it will use your default environment
 - `--conflict OPTION` - use the `abort` option to abort any runs in progress in the same environment as your new run. use the `abort-all` option to abort all runs in progress.
 - `--fg` - results in the foreground - rainforest-cli will not return until the run is complete. This is what you want to make the build pass / fail dependent on rainforest results
@@ -216,6 +218,57 @@ api to construct a junit report.  This is useful to track tests in CI such as Je
 - `--import-variable-name NAME` - Use with `run` and `import-variable-csv-file` to upload
 new tabular variable values before your run to specify the name of your tabular variable.
 
+###Site-ID
+Only run tests for a specific site. Get in touch with us for help on getting that you site id if you are unable to.
+
+<pre>--site-id <b>ID</b></pre>
+
+###Folder-ID
+Run tests in specified folder.
+<pre>--folder <b>ID</b></pre>
+
+###Environment-ID
+run your tests using this environment. Otherwise it will use your default environment
+<pre>--environment-id <b>ID</b></pre>
+
+###Crowd
+<pre>--crowd [<b>default</b>|<b>on_premise_crowd</b>]</pre>
+
+###Conflict
+Use the abort option to abort any runs in progress in the same environment as your new run. use the abort-all option to abort all runs in progress.
+<pre>--conflict <b>option</b></pre> </pre>
+
+###Foreground
+Results in the foreground - rainforest-cli will not return until the run is complete. This is what you want to make the build pass / fail dependent on rainforest results
+<pre>--fg</pre>
+
+###Wait
+Wait for an existing run to finish instead of starting a new one, and exit with a non-0 code if the run fails. rainforest-cli will exit immediately if the run is already complete.
+<pre>--wait <b>RUN_ID</b></pre>
+
+###Fail-fast
+fail the build as soon as the first failed result comes in. If you don't pass this it will wait until 100% of the run is done. Use with --fg.
+<pre>--fail-fast</pre>
+###Custom URL
+
+use a custom url for this run. Example use case: an ad-hoc QA environment with Fourchette. You will need to specify a site_id too for this to work. Note that we will be creating a new environment for this particular run.
+<pre>--custom-url</pre>
+
+###Git-trigger
+only trigger a run when the last commit (for a git repo in the current working directory) has contains @rainforest and a list of one or more tags. E.g. "Fix checkout process. @rainforest #checkout" would trigger a run for everything tagged checkout. This over-rides --tag and any tests specified. If no @rainforest is detected it will exit 0.
+<pre>--git-trigger</pre>
+
+###Description "CI automatic run"
+add an arbitrary description for the run.
+<pre>--description "CI automatic run"</pre>
+
+###Embed-tests
+Use with rainforest export to export your tests without extracting the steps of an embedded test.
+<pre>--embed-tests</pre>
+
+###Test-folder
+Use with rainforest [new, upload, export]. If this option is not provided, rainforest-cli will, in the case of 'new' create a directory, or in the case of 'upload' and 'export' use the directory, at the default path ./spec/rainforest/.
+<pre>--test-folder /path/to/directory</pre>
 
 #### Specifying Test IDs
 Any integers input as arguments in the command line arguments are treated as

data/examples/inline_files.md

@@ -0,0 +1,43 @@
+## Embedding Files Inline
+
+You can embed inline screenshots and file download links directly into RFML by simply supplying the correct step variable and file path in your step.
+
+The file paths used by `file.screenshot` and `file.download` are _relative to the RFML file_. **Your
+file must also be checked into version control.** This ensures that everyone always has the most
+up to date file when using the `upload` command.
+
+#### Inline Screenshots Example
+
+In the example below if your RFML test is located at `~/Desktop/my_test_repo/my_awesome_test.rfml`, then the screenshot in question would be located at `~/Desktop/my_test_repo/test_screenshot.png`.
+
+```
+#! my_rfml_id
+# title: My Awesome Test
+# start_uri: /
+#
+
+Click on the button in this image {{ file.screenshot(./test_screenshot.png) }}.
+Did you go to a login page?
+```
+
+#### Inline Downloadable File Example
+In the example below if your RFML test is located at `~/Desktop/my_test_repo/my_awesome_test.rfml`, then the file in question would be located at `~/Desktop/my_test_repo/test_file.txt`.
+
+```
+#! my_rfml_id
+# title: My Awesome Test
+# start_uri: /
+#
+
+Click on the button in this image {{ file.download(./test_file.txt) }}.
+Did you go to a login page?
+```
+
+
+#### Uploading
+
+Once you have set up your variables, you're done! `rainforest upload` will take care of the rest. You can double check that your uploads were successful but making sure that the file paths were replaced with proper arguments in the dashboard. Proper arguments look similar to the following:
+
+**Screenshots:** `{{ file.screenshot(2262, WVXkKK) }}`
+
+**Downloads:** `{{ file.download(2262, WVXkKK, test_screenshot.png) }}`

data/lib/rainforest_cli/deleter.rb

@@ -7,7 +7,7 @@ class RainforestCli::Deleter
   def initialize(options)
     @file_name = options.file_name
     @test_files = RainforestCli::TestFiles.new(options)
-    @remote_tests = RainforestCli::RemoteTests.new(options.token)
+    @remote_tests = RainforestCli::RemoteTests.new(options)
   end
 
   def delete

data/lib/rainforest_cli/exporter.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
-require 'securerandom'
-require 'rainforest'
 require 'parallel'
 require 'ruby-progressbar'
 
@@ -9,9 +7,8 @@ class RainforestCli::Exporter
 
   def initialize(options)
     @options = options
-    ::Rainforest.api_key = @options.token
     @test_files = RainforestCli::TestFiles.new(@options)
-    @remote_tests = RainforestCli::RemoteTests.new(@options.token)
+    @remote_tests = RainforestCli::RemoteTests.new(@options)
   end
 
   def logger
@@ -33,10 +30,10 @@ class RainforestCli::Exporter
     p = ProgressBar.create(title: 'Tests', total: test_ids.count, format: '%a %B %p%% %t')
     Parallel.each(test_ids, in_threads: threads, finish: lambda { |_item, _i, _result| p.increment }) do |test_id|
       # Get the full test from the API
-      test = Rainforest::Test.retrieve(test_id)
+      test = http_client.get("/tests/#{test_id}")
 
       # File name
-      file_name = sprintf('%010d', test.id) + '_' + test.title.strip.gsub(/[^a-z0-9 ]+/i, '').gsub(/ +/, '_').downcase
+      file_name = sprintf('%010d', test['id']) + '_' + test['title'].strip.gsub(/[^a-z0-9 ]+/i, '').gsub(/ +/, '_').downcase
       file_name = test_files.create_file(file_name)
       File.truncate(file_name, 0)
 
@@ -44,7 +41,7 @@ class RainforestCli::Exporter
         file.puts(get_header(test))
 
         first_step_processed = false
-        test.elements.each_with_index do |element, index|
+        test['elements'].each_with_index do |element, index|
           first_step_processed = process_element(file, element, index, first_step_processed)
         end
       end
@@ -54,15 +51,15 @@ class RainforestCli::Exporter
   private
 
   def process_element(file, element, index, first_step_processed)
-    case element[:type]
+    case element['type']
     when 'test'
       if @options.embed_tests
         file.puts '' unless index == 0
         # no redirect if an embedded test is the first step
-        file.puts "# redirect: #{element[:redirection]}" if index > 0
-        file.puts "- #{element[:element][:rfml_id]}"
+        file.puts "# redirect: #{element['redirection']}" if index > 0
+        file.puts "- #{element['element']['rfml_id']}"
       else
-        element[:element][:elements].each_with_index do |sub_element, i|
+        element['element']['elements'].each_with_index do |sub_element, i|
           # no redirect flags for flattened tests
           process_element(file, sub_element, i + index, true)
         end
@@ -72,27 +69,31 @@ class RainforestCli::Exporter
 
       # add redirect for first step if preceded by an embedded test
       if index > 0 && first_step_processed == false
-        file.puts "# redirect: #{element[:redirection]}"
+        file.puts "# redirect: #{element['redirection']}"
       end
-      file.puts element[:element][:action].gsub("\n", ' ').strip
-      file.puts element[:element][:response].gsub("\n", ' ').strip
+      file.puts element['element']['action'].gsub("\n", ' ').strip
+      file.puts element['element']['response'].gsub("\n", ' ').strip
       first_step_processed = true
     else
-      raise "Unknown element type: #{element[:type]}"
+      raise "Unknown element type: #{element['type']}"
     end
     first_step_processed
   end
 
   def get_header(test)
-    browsers = test.browsers.map { |b| b[:name] if b[:state] == 'enabled' }.compact
+    browsers = test['browsers'].map { |b| b['name'] if b['state'] == 'enabled' }.compact
     <<-EOF
-#! #{test.rfml_id}
-# title: #{test.title}
-# start_uri: #{test.start_uri}
-# tags: #{test.tags.join(", ")}
+#! #{test['rfml_id']}
+# title: #{test['title']}
+# start_uri: #{test['start_uri']}
+# tags: #{test['tags'].join(", ")}
 # browsers: #{browsers.join(", ")}
 #
 
     EOF
   end
+
+  def http_client
+    RainforestCli.http_client
+  end
 end

data/lib/rainforest_cli/http_client.rb

@@ -52,7 +52,12 @@ module RainforestCli
       end
     end
 
+    def api_token_set?
+      !@token.nil?
+    end
+
     private
+
     def wrap_exceptions(retries_on_failures)
       @retry_delay = 0
       @waiting_on_retries = false

data/lib/rainforest_cli/options.rb

@@ -71,11 +71,11 @@ module RainforestCli
           @token = value
         end
 
-        opts.on('--tag TAG', String, 'A tag to run the tests with') do |value|
+        opts.on('--tag TAG', String, 'Filter your tests by tag') do |value|
           @tags << value
         end
 
-        opts.on('--folder ID', 'Run tests in the specified folders') do |value|
+        opts.on('--folder ID', Integer, 'Filter for tests in the specified folders') do |value|
           @folder = value
         end
 

data/lib/rainforest_cli/remote_tests.rb

@@ -1,12 +1,7 @@
 # frozen_string_literal: true
 class RainforestCli::RemoteTests
-  def initialize(api_token = nil)
-    Rainforest.api_key = api_token
-    @client = RainforestCli::HttpClient.new token: api_token
-  end
-
-  def api_token_set?
-    !Rainforest.api_key.nil?
+  def initialize(options)
+    @options = options
   end
 
   def tests
@@ -33,16 +28,10 @@ class RainforestCli::RemoteTests
     primary_key_dictionary
   end
 
-  private
-
-  def logger
-    RainforestCli.logger
-  end
-
   def fetch_tests
-    if api_token_set?
+    if http_client.api_token_set?
       logger.info 'Fetching test data from server...'
-      test_list = @client.get('/tests/rfml_ids')
+      test_list = http_client.get('/tests/rfml_ids', filters)
       logger.info 'Fetch complete.'
       test_list
     else
@@ -50,4 +39,22 @@ class RainforestCli::RemoteTests
       []
     end
   end
+
+  private
+
+  def filters
+    {}.tap do |f|
+      f[:tags] = @options.tags if @options.tags.any?
+      f[:smart_folder_id] = @options.folder if @options.folder
+      f[:site_id] = @options.site_id if @options.site_id
+    end
+  end
+
+  def logger
+    RainforestCli.logger
+  end
+
+  def http_client
+    RainforestCli.http_client
+  end
 end

data/lib/rainforest_cli/test_files.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+require 'securerandom'
+
 class RainforestCli::TestFiles
   DEFAULT_TEST_FOLDER = './spec/rainforest'
   FILE_EXTENSION = '.rfml'

data/lib/rainforest_cli/uploader.rb

@@ -10,7 +10,7 @@ class RainforestCli::Uploader
 
   def initialize(options)
     @test_files = RainforestCli::TestFiles.new(options)
-    @remote_tests = RainforestCli::RemoteTests.new(options.token)
+    @remote_tests = RainforestCli::RemoteTests.new(options)
     @validator = RainforestCli::Validator.new(options, test_files, remote_tests)
   end
 

data/lib/rainforest_cli/validator.rb

@@ -8,7 +8,7 @@ class RainforestCli::Validator
 
   def initialize(options, local_tests = nil, remote_tests = nil)
     @local_tests = local_tests || RainforestCli::TestFiles.new(options)
-    @remote_tests = remote_tests || RainforestCli::RemoteTests.new(options.token)
+    @remote_tests = remote_tests || RainforestCli::RemoteTests.new(options)
   end
 
   def validate
@@ -19,7 +19,7 @@ class RainforestCli::Validator
   def validate_with_exception!
     check_test_directory_for_tests!
 
-    unless remote_tests.api_token_set?
+    unless http_client.api_token_set?
       logger.error API_TOKEN_ERROR
       exit 2
     end
@@ -182,4 +182,8 @@ class RainforestCli::Validator
   def logger
     RainforestCli.logger
   end
+
+  def http_client
+    RainforestCli.http_client
+  end
 end

data/lib/rainforest_cli/version.rb

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

data/spec/rainforest_cli/exporter_spec.rb

@@ -8,11 +8,19 @@ describe RainforestCli::Exporter do
       command: nil,
       debug: nil,
       embed_tests: nil,
-      tests: []
+      tests: [],
+      tags: [],
+      folder: nil,
+      site_id: nil
     )
   end
+  let(:http_client) { instance_double(RainforestCli::HttpClient, api_token_set?: true) }
   subject { described_class.new(options) }
 
+  before do
+    allow(RainforestCli).to receive(:http_client).and_return(http_client)
+  end
+
   describe '#export' do
     # Collect everything printed to file in an array-like file double object
     class FileDouble < Array
@@ -29,63 +37,62 @@ describe RainforestCli::Exporter do
     let(:embedded_rfml_id) { 'embedded_test_rfml_id' }
     let(:embedded_test) do
       {
-        rfml_id: embedded_rfml_id,
-        elements: [
+        'rfml_id' => embedded_rfml_id,
+        'elements' => [
           {
-            type: 'step',
-            element: {
-              action: 'Embedded Action',
-              response: 'Embedded Response'
-            }
-          }
-        ]
+            'type' => 'step',
+            'element' => {
+              'action' => 'Embedded Action',
+              'response' => 'Embedded Response',
+            },
+          },
+        ],
       }
     end
     let(:test_elements) do
       [
         {
-          type: 'test',
-          redirection: true,
-          element: embedded_test
+          'type' => 'test',
+          'redirection' => true,
+          'element' => embedded_test,
         },
         {
-          type: 'step',
-          redirection: false,
-          element: {
-            action: 'Step Action',
-            response: 'Step Response'
-          }
+          'type' => 'step',
+          'redirection' => false,
+          'element' => {
+            'action' => 'Step Action',
+            'response' => 'Step Response',
+          },
         },
         {
-          type: 'test',
-          redirection: true,
-          element: embedded_test
+          'type' => 'test',
+          'redirection' => true,
+          'element' => embedded_test,
         },
         {
-          type: 'step',
-          redirection: false,
-          element: {
-            action: 'Last step',
-            response: 'Last step?'
-          }
-        }
+          'type' => 'step',
+          'redirection' => false,
+          'element' => {
+            'action' => 'Last step',
+            'response' => 'Last step?',
+          },
+        },
       ]
     end
+    let(:single_test_id) { 123 }
     let(:single_test) do
-      Rainforest::Test.new(
-        {
-          id: 123,
-          title: 'Test title',
-          start_uri: '/uri',
-          tags: ['foo', 'bar'],
-          browsers: [
-            { name: 'chrome', state: 'enabled' },
-            { name: 'safari', state: 'enabled' },
-            { name: 'firefox', state: 'disabled' }
-          ],
-          elements: test_elements
-        }
-      )
+      {
+        'id' => single_test_id,
+        'title' => 'Test title',
+        'start_uri' => '/uri',
+        'tags' => ['foo', 'bar'],
+        'browsers' => [
+          { 'name' => 'chrome', 'state' => 'enabled' },
+          { 'name' => 'safari', 'state' => 'enabled' },
+          { 'name' => 'firefox', 'state' => 'disabled' },
+        ],
+        'elements' => test_elements,
+      }
     end
 
     before do
@@ -96,25 +103,26 @@ describe RainforestCli::Exporter do
       allow_any_instance_of(RainforestCli::TestFiles).to receive(:create_file).and_return('file_name')
       allow(File).to receive(:truncate)
 
-      allow_any_instance_of(RainforestCli::HttpClient).to receive(:get).with('/tests/rfml_ids')
+      allow(http_client).to receive(:get).with('/tests/rfml_ids', an_instance_of(Hash))
         .and_return(tests)
-      allow(Rainforest::Test).to receive(:retrieve).and_return(single_test)
-
-      subject.export
+      allow(http_client).to receive(:get).with("/tests/#{single_test_id}").and_return(single_test)
     end
 
     it 'prints an action and response for a step' do
+      subject.export
       expect(file).to include('Step Action')
       expect(file).to include('Step Response')
     end
 
     it 'prints embedded steps' do
+      subject.export
       expect(file).to include('Embedded Action')
       expect(file).to include('Embedded Response')
       expect(file).to_not include("- #{embedded_rfml_id}")
     end
 
     it 'print enabled browsers only' do
+      subject.export
       comments = file[0]
       expect(comments).to include('chrome')
       expect(comments).to include('safari')
@@ -129,16 +137,17 @@ describe RainforestCli::Exporter do
       let(:test_elements) do
         [
           {
-            type: 'step',
-            element: {
-              action: action,
-              response: response
-            }
-          }
+            'type' => 'step',
+            'element' => {
+              'action' => action,
+              'response' => response,
+            },
+          },
         ]
       end
 
       it 'removes the newlines' do
+        subject.export
         expect(file).to include(expected_action)
         expect(file).to include(expected_response)
       end
@@ -148,18 +157,20 @@ describe RainforestCli::Exporter do
       let(:options) do
         instance_double(
           'RainforestCli::Options',
-          token: 'token', test_folder: nil, command: nil,
-          debug: nil, embed_tests: true, tests: [],
+          token: 'token', test_folder: nil, command: nil, debug: nil, embed_tests: true,
+          tests: [], tags: [], folder: nil, site_id: nil
         )
       end
 
       it 'prints an embedded test rfml id' do
+        subject.export
         expect(file).to include("- #{embedded_rfml_id}")
         expect(file_str).to_not include('Embedded Action')
         expect(file_str).to_not include('Embedded Response')
       end
 
       it 'prints the redirects in the correct location' do
+        subject.export
         # the first embedded test should not have a redirect before it
         expect(file_str.scan(/# redirect: true\n- #{embedded_rfml_id}/).count).to eq(1)
 
@@ -182,8 +193,12 @@ describe RainforestCli::Exporter do
         )
       end
 
+      before do
+        allow(http_client).to receive(:get).with(/\/tests\/\d+/).and_return(single_test)
+      end
+
       it 'gets specific tests instead of all' do
-        expect(Rainforest::Test).to receive(:retrieve).exactly(test_ids.length).times
+        expect(http_client).to receive(:get).with(/\/tests\/\d+/).exactly(test_ids.length)
         expect_any_instance_of(RainforestCli::RemoteTests).to_not receive(:primary_ids)
         subject.export
       end

data/spec/rainforest_cli/options_spec.rb

@@ -55,7 +55,7 @@ describe RainforestCli::OptionParser do
 
     context 'run from folder' do
       let(:args) { ['run', '--folder', '12'] }
-      its(:folder) { should == '12'}
+      its(:folder) { should == 12 }
     end
 
     context 'only run in specific browsers' do

data/spec/rainforest_cli/remote_tests_spec.rb

@@ -1,6 +1,14 @@
 # frozen_string_literal: true
 describe RainforestCli::RemoteTests do
-  subject { described_class.new('api_token') }
+  let(:options) { instance_double('RainforestCli::OptionsParser', tags: [], folder: nil, site_id: nil) }
+  let(:tests) { [] }
+  let(:http_client) { instance_double('RainforestCli::HttpClient', api_token_set?: true) }
+  subject { described_class.new(options) }
+
+  before do
+    allow(RainforestCli).to receive(:http_client).and_return(http_client)
+    allow(http_client).to receive(:get).with('/tests/rfml_ids', an_instance_of(Hash)).and_return(tests)
+  end
 
   describe '#primary_key_dictionary' do
     Test = Struct.new(:rfml_id, :id)
@@ -10,29 +18,81 @@ describe RainforestCli::RemoteTests do
     let(:test3) { { 'rfml_id' => 'baz', 'id' => 789 } }
     let(:tests) { [test1, test2, test3] }
 
-    before do
-      allow_any_instance_of(RainforestCli::HttpClient).to receive(:get)
-        .with('/tests/rfml_ids').and_return(tests)
-    end
-
     it "correctly formats the dictionary's keys and values" do
       expect(subject.primary_key_dictionary)
         .to include({
                       test1['rfml_id'] => test1['id'],
                       test2['rfml_id'] => test2['id'],
-                      test3['rfml_id'] => test3['id']
+                      test3['rfml_id'] => test3['id'],
                     })
     end
 
     context 'no api token set' do
-      subject { described_class.new }
+      let(:http_client) { instance_double('RainforestCli::HttpClient', api_token_set?: false) }
 
       it 'does not make an API call but returns an empty dictionary' do
-        expect_any_instance_of(RainforestCli::HttpClient).to_not receive(:get)
+        expect(http_client).to_not receive(:get)
         dictionary = subject.primary_key_dictionary
         expect(dictionary).to be_a(Hash)
         expect(dictionary).to eq({})
       end
     end
   end
+
+  describe '#fetch_tests' do
+    let(:url) { '/tests/rfml_ids' }
+    let(:tags) { ['foo', 'bar'] }
+    let(:smart_folder_id) { 123 }
+    let(:site_id) { 456 }
+
+    context 'with tags option set' do
+      let(:options) { instance_double('RainforestCli::OptionsParser', tags: tags, folder: nil, site_id: nil) }
+
+      it 'uses tags as a request parameter' do
+        expect(http_client).to receive(:get) do |url, params|
+          expect(url).to eq(url)
+          expect(params[:tags]).to eq(tags)
+        end
+        subject.fetch_tests
+      end
+    end
+
+    context 'with smart folder option set' do
+      let(:options) { instance_double('RainforestCli::OptionsParser', tags: [], folder: smart_folder_id, site_id: nil) }
+
+      it 'uses smart_folder_id as a request parameter' do
+        expect(http_client).to receive(:get) do |url, params|
+          expect(url).to eq(url)
+          expect(params[:smart_folder_id]).to eq(smart_folder_id)
+        end
+        subject.fetch_tests
+      end
+    end
+
+    context 'with site id set' do
+      let(:options) { instance_double('RainforestCli::OptionsParser', tags: [], folder: nil, site_id: site_id) }
+
+      it 'uses site_id as a request parameter' do
+        expect(http_client).to receive(:get) do |url, params|
+          expect(url).to eq(url)
+          expect(params[:site_id]).to eq(site_id)
+        end
+        subject.fetch_tests
+      end
+    end
+
+    context 'with all parameters set' do
+      let(:options) { instance_double('RainforestCli::OptionsParser', tags: tags, folder: smart_folder_id, site_id: site_id) }
+
+      it 'uses all request parameters' do
+        expect(http_client).to receive(:get) do |url, params|
+          expect(url).to eq(url)
+          expect(params[:tags]).to eq(tags)
+          expect(params[:smart_folder_id]).to eq(smart_folder_id)
+          expect(params[:site_id]).to eq(site_id)
+        end
+        subject.fetch_tests
+      end
+    end
+  end
 end

data/spec/rainforest_cli/validator_spec.rb

@@ -2,6 +2,11 @@
 
 describe RainforestCli::Validator do
   let(:file_path) { File.join(test_directory, correct_file_name) }
+  let(:http_client) { instance_double('RainforestCli::HttpClient', api_token_set?: true) }
+
+  before do
+    allow(RainforestCli).to receive(:http_client).and_return(http_client)
+  end
 
   def notifies_with_correct_file_name
     expect(subject).to receive(notification_method)
@@ -21,11 +26,11 @@ describe RainforestCli::Validator do
 
   shared_examples 'it detects all the correct errors' do
     let(:tested_method) { :validate }
-    let(:options) { instance_double('RainforestCli::Options', test_folder: test_directory, token: 'api_token', command: '') }
+    let(:options) { instance_double('RainforestCli::Options', test_folder: test_directory, token: 'api_token', command: '', tags: [], folder: nil, site_id: nil) }
     subject { described_class.new(options) }
 
     before do
-      allow_any_instance_of(RainforestCli::HttpClient).to receive(:get).and_return([])
+      allow(http_client).to receive(:get).and_return([])
     end
 
     context 'with parsing errors' do
@@ -125,7 +130,8 @@ describe RainforestCli::Validator do
 
     context 'without a token option' do
       let(:test_directory) { File.expand_path(File.dirname(__FILE__) + '/../validation-examples') }
-      let(:options) { instance_double('RainforestCli::Options', test_folder: test_directory, token: nil, command: '') }
+      let(:options) { instance_double('RainforestCli::Options', test_folder: test_directory, command: '') }
+      let(:http_client) { instance_double('RainforestCli::HttpClient', api_token_set?: false) }
       subject { described_class.new(options) }
 
       it 'validates locally and tells the user to include a token to valid with server tests as well' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rainforest-cli
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Russell Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -188,6 +188,7 @@ files:
 - README.md
 - Rakefile
 - bin/rainforest
+- examples/inline_files.md
 - lib/rainforest_cli.rb
 - lib/rainforest_cli/constants.rb
 - lib/rainforest_cli/csv_importer.rb