learn-test 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8d6dc446d93aaba676a4262cd566d17b2ce0ab360252279f8a69898022dcb3d
-  data.tar.gz: 3fc0f0d6763dd7ea99c6a392ddd01d462105bfd437e4c767d3eac77ca90388c2
+  metadata.gz: a98ee1823d7eaa0784005b131da8261b48f009c5479536157d2061ef1e9ec29f
+  data.tar.gz: 21dfb4ce2145c6c662f0ef0c0c686ad80a325920cd506c8629e730dcbdbd6430
 SHA512:
-  metadata.gz: e3445f079ea9ce53820d8423b705e8b57fa073d243fb3539c9ca17898158ccb28674cd390307e821b98a960accade10051a0c6152b53deaad954c481bc6b8398
-  data.tar.gz: 1872a4b258d1d352a34847c21a8c6e792b4d9c153d419b2267a043e2e3f37f550298c9feda7ba2454a5f0b9aca852c318e6376976084fa1b7f0260ee8c64b635
+  metadata.gz: f11dbf50918100c382e61b8457ca1edda76685766045afbc546bac3d08eada57c08b3e6a5272793ff0c4a5b6ac9f1dc2cf8b03558a0a7197c3271fe17b6c0d71
+  data.tar.gz: 4341c6a7b0fd636b3302ec4dd5c49f0b9a50ee3b261542a2304167596dd3d7c2a301f1289e747a3d2e5e912eb08edea7ac99ef34cf6dad80a5a5c6a582074566

data/.circleci/config.yml

@@ -0,0 +1,59 @@
+version: 2.1
+
+jobs:
+  build:
+    docker:
+       - image: circleci/ruby:2.5.8
+
+    working_directory: ~/repo
+
+    steps:
+      - checkout
+
+      - restore_cache:
+          keys:
+            - gems-v3-{{ checksum "Gemfile.lock" }}
+            - gems-v3-
+
+      - run:
+          name: Force Bundler Version
+          command: |
+            sudo gem update --system
+            echo 'export BUNDLER_VERSION=$(cat Gemfile.lock | tail -1 | tr -d " ")' >> $BASH_ENV
+            source $BASH_ENV
+
+      - run:
+          name: Install Dependencies
+          command: |
+            bundle config --local set vendor/bundle
+            bundle install
+
+      - save_cache:
+          key: gems-v3-{{ checksum "Gemfile.lock" }}
+          paths:
+            - vendor/bundle
+
+      - run:
+          name: Create ~/.netrc
+          command: | 
+            cp spec/fixtures/.netrc ~/
+            chmod 0600 ~/.netrc
+
+      - run:
+          name: Run tests
+          command: |
+            mkdir /tmp/test-results
+            TEST_FILES="$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)"
+            
+            bundle exec rspec --format progress \
+                            --format RspecJunitFormatter \
+                            --out /tmp/test-results/rspec.xml \
+                            --format progress \
+                            $TEST_FILES
+
+      - store_test_results:
+          path: /tmp/test-results
+
+      - store_artifacts:
+          path: /tmp/test-results
+          destination: test-results

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/Gemfile

@@ -1,4 +1,7 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in learn.gemspec
 gemspec
+
+group :test do
+  gem 'rspec_junit_formatter', '~> 0.4.1'
+end

data/Gemfile.lock

@@ -0,0 +1,83 @@
+PATH
+  remote: .
+  specs:
+    learn-test (2.6.1)
+      colorize (~> 0.8.1)
+      crack (~> 0.4.3)
+      faraday (~> 0.9)
+      git (~> 1.2)
+      jasmine (~> 2.6.0, >= 2.6.0)
+      jasmine-core (< 2.99.1)
+      netrc (~> 0.11.0)
+      oj (~> 2.9)
+      rainbow (= 1.99.2)
+      rspec (~> 3.0)
+      selenium-webdriver (~> 2.52.0, >= 2.52.0)
+      webrick (~> 1.3.1, >= 1.3.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    childprocess (0.9.0)
+      ffi (~> 1.0, >= 1.0.11)
+    colorize (0.8.1)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    diff-lcs (1.4.4)
+    faraday (0.17.3)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.13.1)
+    git (1.7.0)
+      rchardet (~> 1.8)
+    jasmine (2.6.0)
+      jasmine-core (>= 2.6.0, < 3.0.0)
+      phantomjs
+      rack (>= 1.2.1)
+      rake
+    jasmine-core (2.99.0)
+    multi_json (1.15.0)
+    multipart-post (2.1.1)
+    netrc (0.11.0)
+    oj (2.18.5)
+    phantomjs (2.1.1.0)
+    rack (2.2.3)
+    rainbow (1.99.2)
+    rake (13.0.1)
+    rchardet (1.8.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    rspec_junit_formatter (0.4.1)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    rubyzip (1.3.0)
+    safe_yaml (1.0.5)
+    selenium-webdriver (2.52.0)
+      childprocess (~> 0.5)
+      multi_json (~> 1.0)
+      rubyzip (~> 1.0)
+      websocket (~> 1.0)
+    webrick (1.3.1)
+    websocket (1.2.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 2.1.4)
+  learn-test!
+  rake (~> 13.0.1)
+  rspec (~> 3.8)
+  rspec_junit_formatter (~> 0.4.1)
+
+BUNDLED WITH
+   2.1.4

data/bin/learn-test

@@ -57,6 +57,10 @@ OptionParser.new do |opts|
     options[:fail_fast] = f
   end
 
+  opts.on("-e", "--example STRING", "Run examples whose full nested names include STRING (may be used more than once)") do |s|
+    (options[:example] ||= []) << s
+  end
+
   if ARGV.any? { |arg| arg == "init" }
     options[:init] = true
   end

data/learn-test.gemspec

@@ -18,8 +18,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib", "bin"]
   spec.required_ruby_version = '>= 2.3.0'
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.1.4"
+  spec.add_development_dependency "rake", "~> 13.0.1"
+  spec.add_development_dependency "rspec", "~> 3.8"
   spec.add_runtime_dependency "rspec", "~> 3.0"
   spec.add_runtime_dependency "netrc", "~> 0.11.0"
   spec.add_runtime_dependency "git", "~> 1.2"

data/lib/learn_test/repo_parser.rb

@@ -6,14 +6,14 @@ module LearnTest
       begin
         repo = Git.open(FileUtils.pwd)
       rescue
-        puts "You don't appear to be in a Learn lesson's directory. Please cd to an appropriate directory and try again."
+        puts "You don't appear to be in a Learn lesson's directory. Please enter 'learn open' or cd to an appropriate directory and try again."
         die
       end
 
       if url = repo.remote.url
         url.match(/(?:https?:\/\/|git@).*\/(.+?)(?:\.git)?$/)[1]
       else
-        puts "You don't appear to be in a Learn lesson's directory. Please cd to an appropriate directory and try again."
+        puts "You don't appear to be in a Learn lesson's directory. Please enter 'learn open' or cd to an appropriate directory and try again."
         die
       end
     end
@@ -23,4 +23,3 @@ module LearnTest
     end
   end
 end
-

data/lib/learn_test/strategies/rspec.rb

@@ -25,6 +25,10 @@ module LearnTest
           argv << '--fail-fast'
         end
 
+        if example_option_present?
+          argv << options[:example].map{|e| "--example #{e}"}.join(" ")
+        end
+
         # Don't pass the test/local flag from learn binary to rspec runner.
         argv.delete("--test")
         argv.delete("-t")
@@ -83,6 +87,10 @@ module LearnTest
         options[:fail_fast]
       end
 
+      def example_option_present?
+        options[:example]
+      end
+
       def dot_rspec
         @dot_rspec ||= File.readlines('.rspec').map(&:strip) if File.exist?('.rspec')
       end

data/lib/learn_test/username_parser.rb

@@ -7,7 +7,7 @@ module LearnTest
 
       if !LearnTest::LearnOauthTokenParser.get_learn_oauth_token && (!username || user_id == 'none')
         print "Enter your github username: "
-        username = gets.strip
+        username = $stdin.gets.strip
         user_id = LearnTest::GithubInteractor.get_user_id_for(username)
         parser.write(username, user_id)
       end

data/lib/learn_test/version.rb

@@ -1,3 +1,3 @@
 module LearnTest
-  VERSION = '2.6.1'
+  VERSION = '2.7.0'
 end

data/spec/features/rspec_unit_spec.rb

@@ -1,10 +1,35 @@
 describe "Running a RSpec Unit Test" do
+  before(:all) do
+    # While it doesn't cause these tests to fail, nasty messages occur (and more)
+    # when either a ~/.netrc entry or file itself doesn't exist. This aims to correct that,
+    # and will only ever be called once.
+
+    LearnTest::UsernameParser.get_username
+  end
+
   context 'a basic rspec unit test' do
     it 'runs the spec with 0 failures' do
       output = `cd ./spec/fixtures/rspec-unit-spec && ./../../../bin/learn-test --local --test`
 
-      expect(output).to include('1 example, 0 failures')
+      expect(output).to include('3 examples, 0 failures')
       expect(output).to_not include('1 failures')
     end
   end
+
+  context 'with the --example flag' do
+    it 'runs only the appropriate tests' do
+      output = `cd ./spec/fixtures/rspec-unit-spec && ./../../../bin/learn-test --local --test --example multiple`
+
+      expect(output).to include('1 example, 0 failures')
+      expect(output).to_not include('2 examples')
+    end
+
+     it 'accepts multiple examples' do
+      output = `cd ./spec/fixtures/rspec-unit-spec && ./../../../bin/learn-test --local --test --example multiple --example accepts`
+
+      expect(output).to include('2 examples, 0 failures')
+      expect(output).to_not include('3 examples')
+      expect(output).to_not include('1 example')
+    end 
+  end
 end

data/spec/fixtures/.netrc

@@ -0,0 +1,3 @@
+machine flatiron-push
+  login tmilewski
+  password 26691

data/spec/fixtures/rspec-unit-spec/spec/dog_spec.rb

@@ -4,4 +4,12 @@ describe Dog do
   it 'runs the spec spec correctly' do
     expect(subject).to be_an_instance_of(Dog)
   end
+
+  it 'has multiple specs' do
+    expect(subject).not_to be_an_instance_of(String)
+  end
+
+  it 'accepts more than one example' do
+    expect(subject).not_to be_an_instance_of(String)
+  end  
 end

data/spec/learn_test/username_parser_spec.rb

@@ -0,0 +1,61 @@
+describe LearnTest::UsernameParser do
+  subject { LearnTest::UsernameParser }
+
+  let(:dbl) { instance_double(LearnTest::NetrcInteractor) }
+
+  let!(:username) { 'learn-co' }
+  let!(:user_id) { '12345' }
+  let!(:token) { 'abc123' }
+
+  context 'user details are stored in ~/.netrc' do
+    context 'username/password' do
+      it 'should return a username' do
+        expect(LearnTest::LearnOauthTokenParser).to receive(:get_learn_oauth_token).and_return(token)
+
+        expect(LearnTest::NetrcInteractor).to receive(:new).and_return(dbl)
+        expect(dbl).to receive(:username).and_return(username)
+        expect(dbl).to receive(:user_id).and_return(user_id)
+
+        expect(dbl).to_not receive(:write)
+
+        expect(subject.get_username).to eq(username)
+      end
+    end
+
+    context 'oauth token' do
+      it 'should return a username' do
+        expect(LearnTest::LearnOauthTokenParser).to receive(:get_learn_oauth_token).and_return(token)
+
+        expect(LearnTest::NetrcInteractor).to receive(:new).and_return(dbl)
+        expect(dbl).to receive(:username).and_return(nil)
+        expect(dbl).to receive(:user_id).and_return(nil)
+
+        expect(dbl).to_not receive(:write)
+
+        expect(subject.get_username).to eq(nil)
+      end
+    end
+  end
+
+  context 'user details are not stored in ~/.netrc' do
+    it 'should ask for and store a username' do
+      @original_stdout = $stdout
+      $stdout = File.open(File::NULL, 'w')
+
+      expect(LearnTest::LearnOauthTokenParser).to receive(:get_learn_oauth_token).and_return(nil)
+
+      expect(LearnTest::NetrcInteractor).to receive(:new).and_return(dbl)
+      expect(dbl).to receive(:username).and_return(nil)
+      expect(dbl).to receive(:user_id).and_return(nil)
+
+      expect($stdin).to receive(:gets).and_return(username)
+      expect(LearnTest::GithubInteractor).to receive(:get_user_id_for).with(username).and_return(user_id)
+      expect(dbl).to receive(:write).with(username, user_id)
+
+      expect(subject.get_username).to eq(username)
+
+      $stdout = @original_stdout
+      @original_stdout = nil
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: learn-test
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Flatiron School
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.1
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -126,20 +140,20 @@ dependencies:
   name: jasmine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.6.0
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.6.0
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.0
 - !ruby/object:Gem::Dependency
@@ -174,20 +188,20 @@ dependencies:
   name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.1
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.1
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.1
 - !ruby/object:Gem::Dependency
@@ -208,20 +222,20 @@ dependencies:
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.52.0
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.52.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.52.0
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.52.0
 description: 
@@ -232,9 +246,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -303,6 +319,7 @@ files:
 - node_modules/karma-json-reporter/package.json
 - spec/features/jasmine_jquery_fixtures_spec.rb
 - spec/features/rspec_unit_spec.rb
+- spec/fixtures/.netrc
 - spec/fixtures/jasmine-jquery-fixtures/index.html
 - spec/fixtures/jasmine-jquery-fixtures/requires.yml
 - spec/fixtures/jasmine-jquery-fixtures/spec/jasmine-jquery-fixtures-spec.js
@@ -311,6 +328,7 @@ files:
 - spec/fixtures/rspec-unit-spec/spec/dog_spec.rb
 - spec/fixtures/rspec-unit-spec/spec/spec_helper.rb
 - spec/learn_test/reporter_spec.rb
+- spec/learn_test/username_parser_spec.rb
 - spec/lib/learn_test/strategies/mocha_spec.rb
 - spec/repo_parser_spec.rb
 - spec/spec_helper.rb
@@ -334,8 +352,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Runs RSpec, Jasmine, Karma, Mocha, and Python Pytest Test builds and pushes
@@ -343,6 +360,7 @@ summary: Runs RSpec, Jasmine, Karma, Mocha, and Python Pytest Test builds and pu
 test_files:
 - spec/features/jasmine_jquery_fixtures_spec.rb
 - spec/features/rspec_unit_spec.rb
+- spec/fixtures/.netrc
 - spec/fixtures/jasmine-jquery-fixtures/index.html
 - spec/fixtures/jasmine-jquery-fixtures/requires.yml
 - spec/fixtures/jasmine-jquery-fixtures/spec/jasmine-jquery-fixtures-spec.js
@@ -351,6 +369,7 @@ test_files:
 - spec/fixtures/rspec-unit-spec/spec/dog_spec.rb
 - spec/fixtures/rspec-unit-spec/spec/spec_helper.rb
 - spec/learn_test/reporter_spec.rb
+- spec/learn_test/username_parser_spec.rb
 - spec/lib/learn_test/strategies/mocha_spec.rb
 - spec/repo_parser_spec.rb
 - spec/spec_helper.rb