jasmine 3.4.0 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 573d809d765f48020312d811f92cd6bdf06a886d
-  data.tar.gz: da52c0fb175781046c1bbf8c4ff8191f6ce0ca45
+SHA256:
+  metadata.gz: 3675b4ae8a2d791c1fb24007ba5c1fa28cb38188289e6c2c97dcd5301af45ba8
+  data.tar.gz: b9899c89395e9248409eb99aa0858fbedbbdf01ed44d2766ab7f22ab8ec87ee4
 SHA512:
-  metadata.gz: e3c51f2e936b5e4d7bc5a3eca0f8be430f77867a357c0d6bc20d5d024b1135a4681124f0ebf84b1450ec681836299ecdf9ee2a6d876c7ceb77c0e81e90ab39e7
-  data.tar.gz: bb5a4f560ed5924e97ebb1363facf140968e8173e6224b5b314cd77cca273b223423006fab49035040696faa0fa7309835ce1239f40769decaf52e252f6c6d9b
+  metadata.gz: b1dd04e5d13478f134e16cf7b1762c180ca6f7ed927d65966f8498e54b72e5f9888911d33243e60f7239f1b43d114d27baa0b27286e0f061ba9e7f6869636429
+  data.tar.gz: e2de6296d752fcbbf7a4e2c7505192aa59810a01e5f470f4e95b58b0dd2458257a3b3861755c129124a5173b3dc59b2f16f07d8d74b906d4981fa0d6b8380815

data/.circleci/config.yml

@@ -0,0 +1,84 @@
+version: 2.1
+orbs:
+  ruby: circleci/ruby@1.1.2 
+
+executors:
+  ruby_3_0:
+    docker:
+      - image: circleci/ruby:3.0-browsers-legacy
+  ruby_2_7:
+    docker:
+      - image: circleci/ruby:2.7-browsers-legacy
+  ruby_2_6:
+    docker:
+      - image: circleci/ruby:2.6-browsers-legacy
+  ruby_2_5:
+    docker:
+      - image: circleci/ruby:2.5-browsers-legacy
+  ruby_2_3:
+    docker:
+      - image: circleci/ruby:2.3-browsers-legacy
+
+jobs:
+  test:
+    parameters:
+      rails_version:
+        type: string
+      executor:
+        type: executor
+    executor: << parameters.executor >>
+    environment:
+      RAILS_VERSION=<< parameters.rails_version >>
+    steps:
+      - checkout:
+         path: jasmine-gem
+      - run:
+          name: Install Node
+          command: sudo apt-get install nodejs
+      - run:
+          name: Install bundler
+          command: "if [ $RAILS_VERSION = rails4 ];then gem install bundler -v '< 2.0' ; else gem install bundler; fi"
+      - run:
+          name: Report versions
+          command: "echo 'Ruby version:' && ruby -v && echo 'Bundler version:' && bundle -v && echo 'RAILS_VERSION:' $RAILS_VERSION"
+      - run:
+          name: Install gems
+          command: "cd jasmine-gem && bundle install"
+      - run:
+          name: Run tests
+          command: "cd jasmine-gem && bundle exec rake --trace"
+
+workflows:
+  version: 2
+  push: &push_workflow
+    jobs:
+      - test:
+          matrix:
+            parameters:
+              rails_version: ["pojs", "rails6", "rails5", "rails4"]
+              executor: ["ruby_3_0", "ruby_2_7", "ruby_2_6", "ruby_2_5", "ruby_2_3"]
+            exclude:
+              # Don't run Rails 4 on newer Rubies that lack an old enough
+              # bundler.
+              - rails_version: "rails4"
+                executor: "ruby_3_0"
+              - rails_version: "rails4"
+                executor: "ruby_2_7"
+              # Rails 6 requires at least Ruby 2.5.
+              - rails_version: "rails6"
+                executor: "ruby_2_3"
+              # Rails 5 requires Ruby < 2.7
+              - rails_version: "rails5"
+                executor: "ruby_3_0"
+              - rails_version: "rails5"
+                executor: "ruby_2_7"
+  cron:
+    <<: *push_workflow
+    triggers:
+      - schedule:
+          # Times are UTC.
+          cron: "0 10 * * *"
+          filters:
+            branches:
+               only:
+                 - main

data/.gitignore

@@ -5,9 +5,9 @@ bin
 .bundle
 .DS_Store
 .rvmrc
+.ruby-version
 .pairs
 *.swp
 tags
 Gemfile.lock
 spec/reports
-.rvmrc

data/Gemfile

@@ -2,11 +2,10 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'anchorman', :platform => :mri
 
 # during development, do not release
-if ENV['TRAVIS']
-  gem 'jasmine-core', :git => 'http://github.com/jasmine/jasmine.git'
+if ENV['CIRCLECI']
+  gem 'jasmine-core', :git => 'http://github.com/jasmine/jasmine.git', ref: 'main'
 else
   gem 'jasmine-core', :path => '../jasmine'
 end
@@ -21,8 +20,6 @@ end
 
 gem 'mime-types', '< 3.0', platform: [:jruby]
 
-platform :rbx do
-  gem 'json'
-  gem 'rubysl'
-  gem 'racc'
+if ENV['RAILS_VERSION'] != 'rails4'
+  gem "bundler", "~> 2.1"
 end

data/README.markdown

@@ -1,5 +1,7 @@
-# The Jasmine Gem [![Build Status](https://travis-ci.org/jasmine/jasmine-gem.png?branch=master)](https://travis-ci.org/jasmine/jasmine-gem)
+# The Jasmine Gem
+[![Build Status](https://circleci.com/gh/jasmine/jasmine-gem.svg?style=shield)](https://circleci.com/gh/jasmine/jasmine-gem)
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fjasmine%2Fjasmine-gem.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fjasmine%2Fjasmine-gem?ref=badge_shield)
+[![Gem Version](https://badge.fury.io/rb/jasmine.svg)](https://badge.fury.io/rb/jasmine)
 
 The [Jasmine](http://github.com/jasmine/jasmine) Ruby Gem is a package of helper code for developing Jasmine projects for Ruby-based web projects (Rails, Sinatra, etc.) or for JavaScript projects where Ruby is a welcome partner. It serves up a project's Jasmine suite in a browser so you can focus on your code instead of manually editing script tags in the Jasmine runner HTML file.
 
@@ -48,9 +50,11 @@ This uses PhantomJS to load and run the Jasmine suite.
 
 Please note that PhantomJS will be auto-installed by the [phantomjs-gem][phantomjs-gem] at the first `rake jasmine:ci` run. If you have a matching PhantomJS version somewhere on your path, it won't install. You can disable automatic installation altogether (and use the PhantomJS on your path) via the config helper in your jasmine_helper.rb:
 
-    Jasmine.configure do |config|
-      config.prevent_phantom_js_auto_install = true
-    end
+```ruby
+Jasmine.configure do |config|
+  config.prevent_phantom_js_auto_install = true
+end
+```
 
 [phantomjs-gem]: https://github.com/colszowka/phantomjs-gem#phantomjs-as-a-rubygem
 
@@ -74,17 +78,56 @@ To change the port that `rake jasmine` uses:
 
 In your jasmine_helper.rb:
 
-    Jasmine.configure do |config|
-       config.server_port = 5555
-    end
+```ruby
+Jasmine.configure do |config|
+  config.server_port = 5555
+end
+```
 
 By default `rake jasmine:ci` will attempt to find a random open port, to set the port that `rake jasmine:ci` uses:
 
 In your jasmine_helper.rb:
 
-    Jasmine.configure do |config|
-       config.ci_port = 1234
-    end
+```ruby
+Jasmine.configure do |config|
+  config.ci_port = 1234
+end
+```
+
+By default `rake jasmine:ci` will print results in color, to change this configuration:
+
+In your jasmine_helper.rb:
+
+```ruby
+Jasmine.configure do |config|
+  config.color = false
+end
+```
+
+## Using headless Chrome
+
+* Add `chrome_remote` as a dependency
+* In your jasmine_helper.rb:
+```ruby
+Jasmine.configure do |config|
+  config.runner_browser = :chromeheadless
+end
+```
+
+### Additional configuration options
+
+* `config.chrome_binary` - to customize which binary to execute
+* `config.chrome_cli_options` - if you know what you're doing you can customize the CLI
+* `config.chrome_startup_timeout` - change the amount of time to wait for chrome to start
+
+### On Travis-CI
+
+Add this to your `.travis.yml`
+
+```yaml
+addons:
+  chrome: stable
+```
 
 ## Support
 

data/jasmine.gemspec

@@ -26,8 +26,10 @@ Gem::Specification.new do |s|
   when 'pojs'
   when 'rails4'
     s.add_development_dependency 'rails', '>= 4.2', '< 5.0.0'
-  else #default to rails 5
-    s.add_development_dependency 'rails', '>= 5'
+  when 'rails5'
+    s.add_development_dependency 'rails', '>= 5', '< 6.0.0'
+  else #default to rails 6 - keep in sync with `rails_version` in spec_helper
+    s.add_development_dependency 'rails', '>= 6', '< 7.0.0'
   end
 
   s.add_development_dependency 'rack-test'
@@ -35,8 +37,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '>= 2.5.0'
   s.add_development_dependency 'nokogiri'
 
-  s.add_dependency 'jasmine-core', '~> 3.4.0'
+  s.add_dependency 'jasmine-core', '~> 3.8.0'
   s.add_dependency 'rack', '>= 1.2.1'
+  s.add_dependency 'webrick'
   s.add_dependency 'rake'
   s.add_dependency 'phantomjs'
 end

data/lib/jasmine/asset_expander.rb

@@ -13,11 +13,11 @@ module Jasmine
     UnsupportedRailsVersion = Class.new(StandardError)
 
     def asset_bundle
-      return Rails4Or5AssetBundle.new if Jasmine::Dependencies.rails4? || Jasmine::Dependencies.rails5?
-      raise UnsupportedRailsVersion, "Jasmine only supports the asset pipeline for Rails 4. - 5"
+      return Rails4Or5Or6AssetBundle.new if Jasmine::Dependencies.rails4? || Jasmine::Dependencies.rails5? || Jasmine::Dependencies.rails6?
+      raise UnsupportedRailsVersion, "Jasmine only supports the asset pipeline for Rails 4. - 6"
     end
 
-    class Rails4Or5AssetBundle
+    class Rails4Or5Or6AssetBundle
       def assets(pathname)
         if pathname =~ /\.css$/
           context.get_stylesheet_assets(pathname.gsub(/\.css$/, ''))
@@ -29,7 +29,23 @@ module Jasmine
       private
 
       def context
-        @context ||= ActionView::Base.new.extend(GetOriginalAssetsHelper)
+        @context ||= template.extend(GetOriginalAssetsHelper)
+      end
+
+      def controller_class
+        Class.new(ActionController::Base)
+      end
+
+      def controller
+        controller_class.new
+      end
+
+      def lookup_context
+        ActionView::LookupContext.new([])
+      end
+
+      def template
+        ActionView::Base.new(lookup_context, {}, controller)
       end
 
       module GetOriginalAssetsHelper

data/lib/jasmine/ci_runner.rb

@@ -11,8 +11,7 @@ module Jasmine
     end
 
     def run
-      formatters = config.formatters.map { |formatter_class| formatter_class.new }
-
+      formatters = build_formatters
       exit_code_formatter = Jasmine::Formatters::ExitCode.new
       formatters << exit_code_formatter
 
@@ -46,5 +45,21 @@ module Jasmine
     def app
       @application_factory.app(@config)
     end
+
+    def build_formatters
+      config.formatters.map do |formatter_class|
+        meta_method = if formatter_class.class == Class
+                        formatter_class.instance_method(:initialize)
+                      else
+                        formatter_class.method(:new)
+                      end
+
+        if meta_method.arity == 0 || meta_method.parameters[0][0] != :req
+          formatter_class.new
+        else
+          formatter_class.new(config)
+        end
+      end
+    end
   end
 end

data/lib/jasmine/configuration.rb

@@ -6,6 +6,7 @@ module Jasmine
     attr_accessor :jasmine_path, :spec_path, :boot_path, :src_path, :image_path, :runner_boot_path
     attr_accessor :jasmine_dir, :spec_dir, :boot_dir, :src_dir, :images_dir, :runner_boot_dir
     attr_accessor :formatters
+    attr_accessor :color
     attr_accessor :host
     attr_accessor :spec_format
     attr_accessor :runner
@@ -51,6 +52,7 @@ module Jasmine
       @runner_browser = :phantomjs
 
       @formatters = [Jasmine::Formatters::Console]
+      @color = true
 
       @server_port = 8888
     end

data/lib/jasmine/dependencies.rb

@@ -10,13 +10,19 @@ module Jasmine
         rails? && Rails.version.to_i == 5
       end
 
+      def rails6?
+        rails? && Rails.version.to_i == 6
+      end
+
       def rails?
         defined?(Rails) && Rails.respond_to?(:version)
       end
 
       def use_asset_pipeline?
-        assets_pipeline_available = (rails4? || rails5?) && Rails.respond_to?(:application) && Rails.application.respond_to?(:assets) && !Rails.application.assets.nil?
-        assets_pipeline_available && (rails4? || rails5?)
+        (rails4? || rails5? || rails6?) &&
+          Rails.respond_to?(:application) &&
+          Rails.application.respond_to?(:assets) &&
+          !Rails.application.assets.nil?
       end
     end
   end

data/lib/jasmine/formatters/console.rb

@@ -1,7 +1,8 @@
 module Jasmine
   module Formatters
     class Console
-      def initialize(outputter = Kernel)
+      def initialize(config, outputter = Kernel)
+        @config = config
         @results = []
         @outputter = outputter
       end
@@ -91,13 +92,13 @@ module Jasmine
       def chars(results)
         results.map do |result|
           if result.succeeded?
-            "\e[32m.\e[0m"
+            colored(:green, '.')
           elsif result.pending?
-            "\e[33m*\e[0m"
+            colored(:yellow, '*')
           elsif result.disabled?
             ""
           else
-            "\e[31mF\e[0m"
+            colored(:red, 'F')
           end
         end.join('')
       end
@@ -111,7 +112,7 @@ module Jasmine
         reason = 'No reason given'
         reason = spec.pending_reason if spec.pending_reason && spec.pending_reason != ''
 
-        "\t#{spec.full_name}\n\t  \e[33m#{reason}\e[0m"
+        "\t#{spec.full_name}\n\t  #{colored(:yellow, reason)}"
       end
 
       def failure_message(failure)
@@ -121,7 +122,7 @@ module Jasmine
       def expectation_message(expectation)
         <<-FE
   Message:
-      \e[31m#{expectation.message}\e[0m
+      #{colored(:red, expectation.message)}
   Stack:
       #{stack(expectation.stack)}
         FE
@@ -130,6 +131,25 @@ module Jasmine
       def stack(stack)
         stack.split("\n").map(&:strip).join("\n      ")
       end
+
+      def colored(color, message)
+        s = case color
+            when :green
+              "\e[32m"
+            when :yellow
+              "\e[33m"
+            when :red
+              "\e[31m"
+            else
+              "\e[0m"
+            end
+
+        if @config.color
+          "#{s}#{message}\e[0m"
+        else
+          message
+        end
+      end
     end
   end
 end

data/lib/jasmine/runners/chrome_headless.rb

@@ -23,7 +23,7 @@ module Jasmine
           raise 'Add "chrome_remote" you your Gemfile. To use chromeheadless we require this gem.'
         end
 
-        chrome = ChromeRemote.client
+        chrome = wait_for { ChromeRemote.client }
         chrome.send_cmd "Runtime.enable"
         chrome.send_cmd "Page.navigate", url: jasmine_server_url
         result_recived = false
@@ -63,6 +63,7 @@ module Jasmine
       def find_chrome_binary
         path = [
           "/usr/bin/google-chrome",
+          "/usr/bin/google-chrome-stable",
           "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
         ].detect { |path|
           File.file?(path)
@@ -77,26 +78,41 @@ module Jasmine
             join(' ')
       end
 
+      def wait_for
+
+
+        puts "new logic"
+
+
+        time = Time.now.to_i
+        result = try_to { yield }
+
+        while !result && Time.now.to_i - time < config.chrome_startup_timeout
+          sleep(0.1)
+          result = try_to { yield }
+        end
+        result
+      end
+
+      def try_to
+        yield
+      rescue
+        nil
+      end
+
       def wait_for_chrome_to_start_debug_socket
-        time = Time.now
-        while Time.now - time < config.chrome_startup_timeout
-          begin;
-            conn = TCPSocket.new('localhost', 9222);
-          rescue SocketError;
-            sleep 0.1
-            next
-          rescue Errno::ECONNREFUSED;
-            sleep 0.1
-            next
-          rescue Errno::EADDRNOTAVAIL;
-            sleep 0.1
-            next
-          else;
-            conn.close;
-            return
+        open_socket = -> do
+          begin
+            conn = TCPSocket.new('localhost', 9222)
+            conn.close
+            true
+          rescue
+            nil
           end
         end
-        raise "Chrome did't seam to start the webSocketDebugger at port: 9222, timeout #{config.chrome_startup_timeout}sec"
+
+        message = "Chrome didn't seem to start the webSocketDebugger at port: 9222, timeout #{config.chrome_startup_timeout}sec"
+        raise message unless wait_for(&open_socket)
       end
 
       def boot_js
@@ -108,4 +124,3 @@ module Jasmine
     end
   end
 end
-