RubyGems - jasmine - Versions diffs - 1.3.2 → 2.0.0.rc2 - Mend

jasmine 1.3.2 → 2.0.0.rc2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (63) hide show

checksums.yaml +7 -0
data/.travis.yml +3 -37
data/Gemfile +11 -2
data/HOW_TO_TEST.markdown +1 -1
data/README.markdown +10 -10
data/Rakefile +18 -29
data/generators/jasmine/templates/jasmine-example/spec/PlayerSpec.js +2 -2
data/generators/jasmine/templates/jasmine-example/spec/SpecHelper.js +14 -8
data/generators/jasmine/templates/spec/javascripts/support/jasmine.yml +3 -3
data/generators/jasmine/templates/spec/javascripts/support/jasmine_helper.rb +1 -0
data/jasmine.gemspec +11 -41
data/lib/generators/jasmine/examples/templates/spec/javascripts/helpers/SpecHelper.js +15 -9
data/lib/generators/jasmine/examples/templates/spec/javascripts/jasmine_examples/PlayerSpec.js +1 -1
data/lib/jasmine.rb +10 -7
data/lib/jasmine/asset_bundle.rb +69 -0
data/lib/jasmine/asset_expander.rb +7 -7
data/lib/jasmine/command_line_tool.rb +18 -0
data/lib/jasmine/config.rb +23 -15
data/lib/jasmine/configuration.rb +14 -8
data/lib/jasmine/core_configuration.rb +7 -4
data/lib/jasmine/dependencies.rb +14 -18
data/lib/jasmine/formatters/base.rb +9 -0
data/lib/jasmine/formatters/console.rb +45 -0
data/lib/jasmine/formatters/junit_xml.rb +47 -0
data/lib/jasmine/path_expander.rb +1 -1
data/lib/jasmine/railtie.rb +7 -6
data/lib/jasmine/reporters/api_reporter.rb +38 -0
data/lib/jasmine/results.rb +28 -9
data/lib/jasmine/results_processor.rb +1 -1
data/lib/jasmine/run.html.erb +1 -1
data/lib/jasmine/run_specs.rb +12 -15
data/lib/jasmine/runners/http.rb +11 -49
data/lib/jasmine/selenium_driver.rb +17 -14
data/lib/jasmine/tasks/jasmine.rake +21 -30
data/lib/jasmine/tasks/{jasmine_rails3.rake → jasmine_rails.rake} +0 -0
data/lib/jasmine/version.rb +1 -1
data/lib/jasmine/yaml_config_parser.rb +9 -0
data/release_notes/v2.0.0.rc2.md +44 -0
data/spec/application_spec.rb +33 -38
data/spec/asset_expander_spec.rb +4 -32
data/spec/configuration_spec.rb +95 -35
data/spec/jasmine_command_line_tool_spec.rb +63 -11
data/spec/jasmine_rails_spec.rb +94 -0
data/spec/lib/jasmine/formatters/base_spec.rb +9 -0
data/spec/lib/jasmine/formatters/console_spec.rb +92 -0
data/spec/lib/jasmine/formatters/junit_xml_spec.rb +55 -0
data/spec/lib/jasmine/reporters/api_reporter_spec.rb +53 -0
data/spec/lib/jasmine/runners/http_spec.rb +21 -0
data/spec/path_expander_spec.rb +25 -0
data/spec/results_spec.rb +59 -17
data/spec/spec_helper.rb +36 -18
data/spec/support/fake_selenium_driver.rb +35 -0
data/spec/yaml_config_parser_spec.rb +37 -0
metadata +65 -103
data/generators/jasmine/templates/jasmine-example/SpecRunner.html +0 -54
data/lib/jasmine/asset_pipeline_utility.rb +0 -19
data/lib/jasmine/javascripts/boot.js +0 -28
data/lib/jasmine/rspec_formatter.rb +0 -92
data/spec/dependencies_spec.rb +0 -315
data/spec/jasmine_rails2_spec.rb +0 -89
data/spec/jasmine_rails3_spec.rb +0 -69
data/spec/jasmine_self_test_spec.rb +0 -29
data/spec/rspec_formatter_spec.rb +0 -88

data/lib/jasmine/results.rb CHANGED Viewed

@@ -1,19 +1,38 @@
 module Jasmine
   class Results
+    attr_reader :results
-    attr_reader :suites
-    def initialize(result_hash, suite_hash, example_locations)
-      @suites = suite_hash
-      @results = result_hash
-      @example_locations = example_locations
+    def initialize(raw_results)
+      @results = raw_results.map {|raw| Result.new(raw) }
     end
-    def for_spec_id(id)
-      @results[id]
+    def failures
+      @results.select { |result|
+        result.status == "failed"
+      }
     end
-    def example_location_for(spec_description)
-      @example_locations[spec_description]
+    def pending_specs
+      @results.select { |result|
+        result.status == "pending"
+      }
+    end
+    def size
+      @results.size
+    end
+    class Result < OpenStruct
+      def full_name
+        fullName
+      end
+      def failed_expectations
+        failedExpectations.map { |e|
+          short_stack = e["stack"].split("\n").slice(0, 7).join("\n")
+          OpenStruct.new(:message => e["message"], :stack => short_stack)
+        }
+      end
     end
   end
 end

data/lib/jasmine/results_processor.rb CHANGED Viewed

@@ -6,7 +6,7 @@ module Jasmine
     end
     def process(results_hash, suites_hash)
-      return Jasmine::Results.new(results_hash, suites_hash, example_locations)
+      Jasmine::Results.new(results_hash, suites_hash, example_locations)
     end
     def example_locations

data/lib/jasmine/run.html.erb CHANGED Viewed

@@ -3,7 +3,7 @@
 <head>
   <meta content="text/html;charset=UTF-8" http-equiv="Content-Type"/>
   <title>Jasmine suite</title>
-  <link rel="shortcut icon" type="image/png" href="/__JASMINE_ROOT__/images/jasmine_favicon.png">
+  <link rel="shortcut icon" type="image/png" href="/__images__/jasmine_favicon.png">
   <% css_files.each do |css_file| %>
     <link rel="stylesheet" href="<%= css_file %>" type="text/css" media="screen"/>
   <% end %>

data/lib/jasmine/run_specs.rb CHANGED Viewed

@@ -2,15 +2,7 @@ $:.unshift(ENV['JASMINE_GEM_PATH']) if ENV['JASMINE_GEM_PATH'] # for gem testing
 require 'rubygems'
 require 'jasmine'
-if Jasmine::Dependencies.rspec2?
-  require 'rspec'
-else
-  require 'spec'
-end
-jasmine_yml = File.join(Dir.pwd, 'spec', 'javascripts', 'support', 'jasmine.yml')
-if File.exist?(jasmine_yml)
-end
+require 'rspec'
 Jasmine.load_configuration_from_yaml
@@ -26,11 +18,16 @@ t = Thread.new do
   # # ignore bad exits
 end
 t.abort_on_exception = true
-Jasmine::wait_for_listener(config.port, "jasmine server")
-puts "jasmine server started."
+Jasmine::wait_for_listener(config.port, 'jasmine server')
+puts 'jasmine server started.'
-results_processor = Jasmine::ResultsProcessor.new(config)
-results = Jasmine::Runners::HTTP.new(driver, results_processor, config.result_batch_size).run
-formatter = Jasmine::RspecFormatter.new
-formatter.format_results(results)
+reporter = Jasmine::Reporters::ApiReporter.new(driver, config.result_batch_size)
+raw_results = Jasmine::Runners::HTTP.new(driver, reporter).run
+results = Jasmine::Results.new(raw_results)
+config.formatters.each do |formatter_class|
+  formatter = formatter_class.new(results)
+  formatter.format()
+end
+exit results.failures.size

data/lib/jasmine/runners/http.rb CHANGED Viewed

@@ -1,71 +1,33 @@
 module Jasmine
   module Runners
-    class HTTP
-      attr_accessor :suites
-      def initialize(client, results_processor, result_batch_size)
-        @client = client
-        @results_processor = results_processor
-        @result_batch_size = result_batch_size
-      end
+    class HTTP < Struct.new(:driver, :reporter)
       def run
-        @client.connect
-        load_suite_info
+        driver.connect
+        ensure_connection_established
         wait_for_suites_to_finish_running
-        results = @results_processor.process(results_hash, suites)
-        @client.disconnect
+        results = reporter.results
+        driver.disconnect
         results
       end
       private
-      def load_suite_info
+      def ensure_connection_established
         started = Time.now
-        while !eval_js('return jsApiReporter && jsApiReporter.started') do
+        until reporter.started? do
           raise "couldn't connect to Jasmine after 60 seconds" if (started + 60 < Time.now)
           sleep 0.1
         end
-        @suites = eval_js("var result = jsApiReporter.suites(); if (window.Prototype && Object.toJSON) { return Object.toJSON(result) } else { return JSON.stringify(result) }")
-      end
-      def results_hash
-        spec_results = {}
-        spec_ids.each_slice(@result_batch_size) do |slice|
-          spec_results.merge!(eval_js("var result = jsApiReporter.resultsForSpecs(#{json_generate(slice)}); if (window.Prototype && Object.toJSON) { return Object.toJSON(result) } else { return JSON.stringify(result) }"))
-        end
-        spec_results
-      end
-      def spec_ids
-        map_spec_ids = lambda do |suites|
-          suites.map do |suite_or_spec|
-            if suite_or_spec['type'] == 'spec'
-              suite_or_spec['id']
-            else
-              map_spec_ids.call(suite_or_spec['children'])
-            end
-          end
-        end
-        map_spec_ids.call(@suites).compact.flatten
       end
       def wait_for_suites_to_finish_running
         puts "Waiting for suite to finish in browser ..."
-        while !eval_js('return jsApiReporter.finished') do
+        until reporter.finished? do
           sleep 0.1
         end
       end
-      def eval_js(script)
-        @client.eval_js(script)
-      end
-      def json_generate(obj)
-        @client.json_generate(obj)
-      end
     end
   end
 end

data/lib/jasmine/selenium_driver.rb CHANGED Viewed

@@ -3,22 +3,25 @@ module Jasmine
   class SeleniumDriver
     def initialize(browser, http_address)
       require 'selenium-webdriver'
-      selenium_server = if ENV['SELENIUM_SERVER']
-        ENV['SELENIUM_SERVER']
-      elsif ENV['SELENIUM_SERVER_PORT']
-        "http://localhost:#{ENV['SELENIUM_SERVER_PORT']}/wd/hub"
-      end
-      options = if browser == "firefox" && ENV["JASMINE_FIREBUG"]
-                  require File.join(File.dirname(__FILE__), "firebug/firebug")
-                  profile = Selenium::WebDriver::Firefox::Profile.new
+      selenium_server = if Jasmine.config.selenium_server
+                          Jasmine.config.selenium_server
+                        elsif Jasmine.config.selenium_server_port
+                          "http://localhost:#{Jasmine.config.selenium_server_port}/wd/hub"
+                        end
+      options = if browser == 'firefox-firebug'
+                  require File.join(File.dirname(__FILE__), 'firebug/firebug')
+                  (profile = Selenium::WebDriver::Firefox::Profile.new)
                   profile.enable_firebug
                   {:profile => profile}
                 end || {}
-      @driver = if selenium_server
-        Selenium::WebDriver.for :remote, :url => selenium_server, :desired_capabilities => browser.to_sym
-      else
-        Selenium::WebDriver.for browser.to_sym, options
-      end
+      @driver = if Jasmine.config.webdriver
+                  Jasmine.config.webdriver
+                elsif selenium_server
+                  Selenium::WebDriver.for :remote, :url => selenium_server, :desired_capabilities => browser.to_sym
+                else
+                  Selenium::WebDriver.for browser.to_sym, options
+                end
       @http_address = http_address
     end
@@ -32,7 +35,7 @@ module Jasmine
     def eval_js(script)
       result = @driver.execute_script(script)
-      JSON.parse("{\"result\":#{result}}", :max_nesting => false)["result"]
+      JSON.parse("{\"result\":#{result.to_json}}", :max_nesting => false)['result']
     end
     def json_generate(obj)

data/lib/jasmine/tasks/jasmine.rake CHANGED Viewed

@@ -1,4 +1,8 @@
 namespace :jasmine do
+  require 'jasmine/config'
+  Jasmine.load_configuration_from_yaml
   task :require do
     require 'jasmine'
   end
@@ -12,44 +16,31 @@ namespace :jasmine do
     end
   end
-  desc "Run continuous integration tests"
-  task :ci => ["jasmine:require_json", "jasmine:require"] do
-    if Jasmine::Dependencies.rspec2?
-      require "rspec"
-      require "rspec/core/rake_task"
-    else
-      require "spec"
-      require 'spec/rake/spectask'
-    end
+  desc 'Run continuous integration tests'
+  task :ci => %w(jasmine:require_json jasmine:require) do
+    require 'rspec'
+    require 'rspec/core/rake_task'
-    if Jasmine::Dependencies.rspec2?
-      RSpec::Core::RakeTask.new(:jasmine_continuous_integration_runner) do |t|
-        t.rspec_opts = ["--colour", "--format", ENV['JASMINE_SPEC_FORMAT'] || "progress"]
-        t.verbose = true
-        if Jasmine::Dependencies.rails_3_asset_pipeline?
-          t.rspec_opts += ["-r #{File.expand_path(File.join(::Rails.root, 'config', 'environment'))}"]
-        end
-        t.pattern = [Jasmine.runner_filepath]
-      end
-    else
-      Spec::Rake::SpecTask.new(:jasmine_continuous_integration_runner) do |t|
-        t.spec_opts = ["--color", "--format", ENV['JASMINE_SPEC_FORMAT'] || "specdoc"]
-        t.verbose = true
-        t.spec_files = [Jasmine.runner_filepath]
+    RSpec::Core::RakeTask.new(:jasmine_continuous_integration_runner) do |t|
+      t.rspec_opts = ['--colour', '--format', Jasmine.config.spec_format || 'progress']
+      t.verbose = true
+      if Jasmine::Dependencies.use_asset_pipeline?
+        t.rspec_opts += ["-r #{File.expand_path(File.join(::Rails.root, 'config', 'environment'))}"]
       end
+      t.pattern = [Jasmine.runner_filepath]
     end
-    Rake::Task["jasmine_continuous_integration_runner"].invoke
+    Rake::Task['jasmine_continuous_integration_runner'].invoke
   end
-  task :server => "jasmine:require" do
-    port = ENV['JASMINE_PORT'] || 8888
-    puts "your tests are here:"
+  task :server => 'jasmine:require' do
+    port = Jasmine.config.jasmine_port || 8888
+    puts 'your tests are here:'
     puts "  http://localhost:#{port}/"
-    Jasmine.load_configuration_from_yaml
     app = Jasmine::Application.app(Jasmine.config)
     Jasmine::Server.new(port, app).start
   end
 end
-desc "Run specs via server"
-task :jasmine => ['jasmine:server']
+desc 'Run specs via server'
+task :jasmine => %w(jasmine:server)

data/lib/jasmine/tasks/{jasmine_rails3.rake → jasmine_rails.rake} RENAMED Viewed

File without changes

data/lib/jasmine/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Jasmine
-  VERSION = "1.3.2"
+  VERSION = "2.0.0.rc2"
 end

data/lib/jasmine/yaml_config_parser.rb CHANGED Viewed

@@ -22,6 +22,11 @@ module Jasmine
       File.join(@pwd, loaded_yaml['jasmine_dir'])
     end
+    def boot_dir
+      return nil unless loaded_yaml['boot_dir']
+      File.join(@pwd, loaded_yaml['boot_dir'])
+    end
     def src_files
       @path_expander.call(src_dir, loaded_yaml['src_files'] || [])
     end
@@ -30,6 +35,10 @@ module Jasmine
       @path_expander.call(jasmine_dir, loaded_yaml['jasmine_files'] || [])
     end
+    def boot_files
+      @path_expander.call(boot_dir, loaded_yaml['boot_files'] || [])
+    end
     def jasmine_css_files
       @path_expander.call(jasmine_dir, loaded_yaml['jasmine_css_files'] || [])
     end

data/release_notes/v2.0.0.rc2.md ADDED Viewed

@@ -0,0 +1,44 @@
+# Jasmine Gem 2.0 Release Notes
+## Summary
+These notes cover v2.0.0.rc2.
+## Changes
+* Support for changes in Jasmine 2.0
+  * hooks for `boot_dir` and `boot_files`
+  * New resutls interface in reporters
+* Results Formatters
+    * New console results formatter for CI tasks - no longer depend on RSpec for console output
+    * Optional JUnit XML results formatter for CI tasks
+    * Projects can provide custom formatters
+* Rails 4 support
+* Better support for non-Rails Ruby projects
+* Loosely pinning to jasmine-core, allowing for jasmine-core's build to work on release for jasmine build to work.
+    * SHA: 42021e3a86e57f6b7b23dfbe921867d7560f4e4f
+* Add warning to jasmine init
+    * SHA: e071474b014e7d6909d69f86988b84eacb801201
+* Globbing should now return files in a consistent, predictable order across systems
+* Reactivated the Rails integration tests; fix resulting issues
+* Added the configuration option to specify your own webdriver instance
+* Brought back the Jasmine Favicon
+## Dropped Support
+* ENV variables removed - use Jasmine.configure to set browser, ports, etc.
+* Dropped support for 1.8.x Rubies, Rails 2, RSpec 1 - please continue to use Jasmine gem 1.3.2
+* "self-test" is gone as [Jasmine core now tests itself](http://travis-ci.org/pivotal/jasmine)
+## Pull Requests
+* Fix README.markdown and add config example #[144](http://github.com/pivotal/jasmine-gem/pull/144) from enrapt-mochizuki
+* Use a relative path to jasmine repo in Gemfile #[161](http://github.com/pivotal/jasmine-gem/pull/161) from zephyr-dev
+* Problem when using a asset prefix other than '/assets' #[155](http://github.com/pivotal/jasmine-gem/pull/155) from janv
+* Remove unused code - #[154]((http://github.com/pivotal/jasmine-gem/pull/154) from daytonn
+* Fix default path for :spec_helper in template #[147]((http://github.com/pivotal/jasmine-gem/pull/147) from kmayer
+* Improve Gemfile installation instructions #[141]((http://github.com/pivotal/jasmine-gem/pull/141)
+------
+_Release Notes generated with [Anchorman](http://github.com/infews/anchorman)_

data/spec/application_spec.rb CHANGED Viewed

@@ -1,44 +1,39 @@
 require 'spec_helper'
-#Rspec 1 doesn't correctly pass blocks to stubs, so skip (covered by integration tests)
-#https://groups.google.com/forum/?fromgroups=#!topic/rspec/XT7paH2asCo
+describe 'Jasmine::Application' do
+  it 'should map paths provided by the config' do
+    handler1 = double(:handler1)
+    handler2 = double(:handler2)
+    app1 = double(:app1)
+    app2 = double(:app2)
+    rack_path_map = {'/foo' => lambda { handler1 }, '/bar' => lambda { handler2 }}
+    config = double(:config, :rack_path_map => rack_path_map, :rack_apps => [])
+    builder = double('Rack::Builder.new')
+    #Rack::Builder instance evals, so builder.run is invalid syntax,
+    #this is the only way to stub out the 'run' dsl it gives to the block.
+    Jasmine::Application.stub(:run).with(handler1).and_return(app1)
+    Jasmine::Application.stub(:run).with(handler2).and_return(app2)
-if Jasmine::Dependencies.rspec2?
-  describe "Jasmine::Application" do
-    it "should map paths provided by the config" do
-      handler1 = double(:handler1)
-      handler2 = double(:handler2)
-      app1 = double(:app1)
-      app2 = double(:app2)
-      rack_path_map = {"/foo" => lambda { handler1 }, "/bar" => lambda { handler2 }}
-      config = double(:config, :rack_path_map => rack_path_map, :rack_apps => [])
-      builder = double("Rack::Builder.new")
-      #Rack::Builder instance evals, so builder.run is invalid syntax,
-      #this is the only way to stub out the 'run' dsl it gives to the block.
-      Jasmine::Application.stub(:run).with(handler1).and_return(app1)
-      Jasmine::Application.stub(:run).with(handler2).and_return(app2)
-      builder.should_receive(:map).twice do |path, &app|
-        if path == '/foo'
-          app.call.should == app1
-        elsif path == '/bar'
-          app.call.should == app2
-        else
-          raise "Unexpected path passed"
-        end
+    builder.should_receive(:map).twice do |path, &app|
+      if path == '/foo'
+        app.call.should == app1
+      elsif path == '/bar'
+        app.call.should == app2
+      else
+        raise 'Unexpected path passed'
       end
-      Jasmine::Application.app(config, builder).should == builder
-    end
-    it "should run rack apps provided by the config" do
-      app1 = double(:app1)
-      app2 = double(:app2)
-      block = lambda { "foo" }
-      config = double(:config, :rack_path_map => [], :rack_apps => [[app1, nil], [app2, block]])
-      builder = double("Rack::Builder.new")
-      builder.should_receive(:use).with(app1)
-      builder.should_receive(:use).with(app2, &block)
-      Jasmine::Application.app(config, builder).should == builder
     end
+    Jasmine::Application.app(config, builder).should == builder
+  end
+  it 'should run rack apps provided by the config' do
+    app1 = double(:app1)
+    app2 = double(:app2)
+    block = lambda { 'foo' }
+    config = double(:config, :rack_path_map => [], :rack_apps => [[app1, nil], [app2, block]])
+    builder = double('Rack::Builder.new')
+    builder.should_receive(:use).with(app1)
+    builder.should_receive(:use).with(app2, &block)
+    Jasmine::Application.app(config, builder).should == builder
   end
-end
+end