jasmine 1.3.2 → 2.0.0.rc2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 829cb8b7df0ab6b49277bd1ff57726df9def1ad5
+  data.tar.gz: 8b35c826f0dce1001cfb2f572139b104f1d0cfa8
+SHA512:
+  metadata.gz: c88cd5229bba530394d60d17a6221812e71623b9f44f88ff4d480280a7c0a92ca29942635bbb02b5c89b0eb386bfd79ba01f4a7b053d8f3628be13cab48dd9f1
+  data.tar.gz: ca5e0e70008293b2c96f142df85aa0d7a014a7dfea1a71c93151d13115c81f746210e6698b1da7dacbdab2d2b72bf400546b33822ce700ea4880c137dbff65cc

data/.travis.yml

@@ -3,55 +3,21 @@ before_script:
 script: "DISPLAY=:99.0 bundle exec rake"
 
 rvm:
-  - "1.8.7"
-  - "1.9.2"
   - "1.9.3"
-  - "ree"
+  - "2.0.0"
   - "jruby"
-  - "rbx"
+  - "rbx-19mode"
 
 env:
- - "RAILS_VERSION=rails2"
- - "RAILS_VERSION=rails2_3_5"
  - "RAILS_VERSION=rails3"
- - "RAILS_VERSION=pojs-rspec1"
+ - "RAILS_VERSION=rails4"
  - "RAILS_VERSION=pojs-rspec2"
 
 matrix:
   exclude:
-    - rvm: rbx
-      env: RAILS_VERSION=rails2
-    - rvm: rbx
-      env: RAILS_VERSION=rails2_3_5
-    - rvm: rbx
-      env: RAILS_VERSION=pojs-rspec1
     - rvm: rbx
       env: RAILS_VERSION=pojs-rspec2
     - rvm: jruby
-      env: RAILS_VERSION=rails2
-    - rvm: jruby
-      env: RAILS_VERSION=rails2_3_5
-    - rvm: jruby
-      env: RAILS_VERSION=pojs-rspec1
-    - rvm: jruby
-      env: RAILS_VERSION=pojs-rspec2
-    - rvm: 1.9.2
-      env: RAILS_VERSION=rails2
-    - rvm: 1.9.2
-      env: RAILS_VERSION=rails2_3_5
-    - rvm: 1.9.2
-      env: RAILS_VERSION=pojs-rspec1
-    - rvm: 1.9.2
-      env: RAILS_VERSION=pojs-rspec2
-    - rvm: ree
-      env: RAILS_VERSION=pojs-rspec2
-    - rvm: 1.8.7
-      env: RAILS_VERSION=rails2
-    - rvm: 1.8.7
-      env: RAILS_VERSION=rails2_3_5
-    - rvm: 1.8.7
-      env: RAILS_VERSION=pojs-rspec1
-    - rvm: 1.8.7
       env: RAILS_VERSION=pojs-rspec2
   allow_failures:
     - rvm: rbx

data/Gemfile

@@ -1,8 +1,17 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
+
 gemspec
 
-unless ENV["TRAVIS"]
+unless ENV['TRAVIS']
   group :debug do
     gem 'debugger'
   end
 end
+
+
+# during development, do not release
+if ENV['TRAVIS']
+  gem 'jasmine-core', :git => 'http://github.com/pivotal/jasmine.git'
+else
+  gem 'jasmine-core', :path => '../jasmine'
+end

data/HOW_TO_TEST.markdown

@@ -1,6 +1,6 @@
 To test changes to the jasmine-gem:
 
-* Export RAILS_VERSION as either "pojs-rspec1",  "pojs-rspec2", or "rails2" to test environments other than Rails 3.
+* Export RAILS_VERSION as either "pojs-rspec2", or "rails3" to test environments other than Rails 4.
 * Delete `Gemfile.lock`
 * Clear out your current gemset
 * exec a `bundle install`

data/README.markdown

@@ -7,19 +7,19 @@ This gem contains:
 
 * A small server that builds and executes a Jasmine suite for a project
 * A script that sets up a project to use the Jasmine gem's server
-* Generators for Ruby on Rails projects (Rails 2 and Rails 3)
+* Generators for Ruby on Rails projects (Rails 3 and Rails 4)
 
 You can get all of this by: `gem install jasmine` or by adding Jasmine to your `Gemfile`.
 
-## Init A Project
-
-To initialize a project for Jasmine, it depends on your web framework
+```ruby
+group :development, :test do
+  gem 'jasmine'
+end
+```
 
-For Rails2 support, use
-
-`script/generate jasmine`
+## Init A Project
 
-For Rails3 support, use
+To initialize a project for Jasmine
 
 `rails g jasmine:install`
 `rails g jasmine:examples`
@@ -46,7 +46,7 @@ For Continuous Integration environments, add this task to the project build step
 
 `rake jasmine:ci`
 
-This uses Selenium to launch a browser and run the Jasmine suite. Then it uses RSpec to extract the results from the Jasmine reporter and write them to your build log. The browser used by selenium can be changed by setting the JASMINE_BROWSER environment variable (this might require additional webdriver dependencies).
+This uses Selenium to launch a browser and run the Jasmine suite. Then it uses RSpec to extract the results from the Jasmine reporter and write them to your build log. The browser used by selenium can be changed by configuration in spec_helper file (this might require additional webdriver dependencies).
 
 ## Configuration
 
@@ -72,4 +72,4 @@ Twitter: [@jasminebdd](http://twitter.com/jasminebdd)
 
 Please file issues here at Github
 
-Copyright (c) 2008-2010 Pivotal Labs. This software is licensed under the MIT License.
+Copyright (c) 2008-2013 Pivotal Labs. This software is licensed under the MIT License.

data/Rakefile

@@ -1,55 +1,44 @@
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift File.expand_path("#{File.dirname(__FILE__)}/lib")
-require "bundler"
+require 'bundler'
 Bundler::GemHelper.install_tasks
 
-require "jasmine"
-if Jasmine::Dependencies.rspec2?
-  require 'rspec'
-  require 'rspec/core/rake_task'
-else
-  require 'spec'
-  require 'spec/rake/spectask'
-end
+require 'jasmine'
+require 'rspec'
+require 'rspec/core/rake_task'
 
-desc "Run all examples"
-if Jasmine::Dependencies.rspec2?
-  RSpec::Core::RakeTask.new(:spec) do |t|
-    t.pattern = 'spec/**/*_spec.rb'
-  end
-else
-  Spec::Rake::SpecTask.new('spec') do |t|
-    t.spec_files = FileList['spec/**/*.rb']
-  end
+desc 'Run all examples'
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = 'spec/**/*_spec.rb'
 end
 
-task :spec => ['jasmine:copy_examples_to_gem']
+task :spec => %w(jasmine:copy_examples_to_gem)
 
 task :default => :spec
 
 namespace :jasmine do
-  require "jasmine-core"
+  require 'jasmine-core'
   task :server do
-    port = ENV['JASMINE_PORT'] || 8888
     Jasmine.configure do |config|
-      root = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+      root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
       config.src_dir = File.join(root, 'src')
       config.spec_dir = Jasmine::Core.path
       config.spec_files = lambda { (Jasmine::Core.html_spec_files + Jasmine::Core.core_spec_files).map {|f| File.join(config.spec_dir, f) } }
+      config.jasmine_port = ENV['JASMINE_PORT'] || 8888
     end
 
     config = Jasmine.config
 
-    server = Jasmine::Server.new(8888, Jasmine::Application.app(config))
+    server = Jasmine::Server.new(config.jasmine_port, Jasmine::Application.app(config))
     server.start
 
-    puts "your tests are here:"
-    puts "  http://localhost:#{port}/"
+    puts 'your tests are here:'
+    puts "  http://localhost:#{config.jasmine_port}/"
   end
 
-  desc "Copy examples from Jasmine JS to the gem"
+  desc 'Copy examples from Jasmine JS to the gem'
   task :copy_examples_to_gem do
-    require "fileutils"
+    require 'fileutils'
 
     # copy jasmine's example tree into our generator templates dir
     FileUtils.rm_r('generators/jasmine/templates/jasmine-example', :force => true)
@@ -57,6 +46,6 @@ namespace :jasmine do
   end
 end
 
-desc "Run specs via server"
-task :jasmine => ['jasmine:server']
+desc 'Run specs via server'
+task :jasmine => %w(jasmine:server)
 

data/generators/jasmine/templates/jasmine-example/spec/PlayerSpec.js

@@ -52,7 +52,7 @@ describe("Player", function() {
 
       expect(function() {
         player.resume();
-      }).toThrow("song is already playing");
+      }).toThrowError("song is already playing");
     });
   });
-});
+});

data/generators/jasmine/templates/jasmine-example/spec/SpecHelper.js

@@ -1,9 +1,15 @@
-beforeEach(function() {
-  this.addMatchers({
-    toBePlaying: function(expectedSong) {
-      var player = this.actual;
-      return player.currentlyPlayingSong === expectedSong && 
-             player.isPlaying;
-    }
-  });
+beforeEach(function () {
+    jasmine.Expectation.addMatchers({
+        toBePlaying: function () {
+            return {
+                compare: function (actual, expected) {
+                    var player = actual;
+
+                    return {
+                        pass: player.currentlyPlayingSong === expected && player.isPlaying
+                    }
+                }
+            };
+        }
+    });
 });

data/generators/jasmine/templates/spec/javascripts/support/jasmine.yml

@@ -77,12 +77,12 @@ spec_dir:
 #
 # Ruby file that Jasmine server will require before starting.
 # Returned relative to your root path
-# Default spec/support/jasmine_helper.rb
+# Default spec/javascripts/support/jasmine_helper.rb
 #
 # EXAMPLE:
 #
-# spec_helper: spec/support/jasmine_helper.rb
+# spec_helper: spec/javascripts/support/jasmine_helper.rb
 #
-spec_helper: spec/support/jasmine_helper.rb
+spec_helper: spec/javascripts/support/jasmine_helper.rb
 
 

data/generators/jasmine/templates/spec/javascripts/support/jasmine_helper.rb

@@ -6,6 +6,7 @@
 #Jasmine.configure do |config|
 #   config.boot_dir = '/absolute/path/to/boot_dir'
 #   config.boot_files = lambda { ['/absolute/path/to/boot_dir/file.js'] }
+#   config.browser = :firefox
 #end
 #
 

data/jasmine.gemspec

@@ -20,57 +20,27 @@ Gem::Specification.new do |s|
   s.require_paths      = ["lib"]
   s.rdoc_options       = ["--charset=UTF-8"]
 
-  if ENV['RAILS_VERSION'] == 'pojs-rspec1'
-    if ENV["RUBY_VERSION"] =~ /1\.8\.6/
-      #1.3.2 buffer overflows
-      s.add_development_dependency 'rspec', '= 1.3.1'
-      s.add_development_dependency 'rack', "1.1"
-    else
-      s.add_development_dependency 'rspec', '>= 1.3.1', '< 2'
-    end
-    s.add_development_dependency 'rake-tasks'
-  elsif ENV['RAILS_VERSION'] == 'pojs-rspec2'
-    if ENV["RUBY_VERSION"] =~ /1\.8\.6/
-      #2.7.0 uses reduce vs inject, non 1.8.6 compatible
-      s.add_development_dependency 'rspec', '2.6.0'
-    else
-      s.add_development_dependency 'rspec', '>= 2.5.0'
-    end
+  if ENV['RAILS_VERSION'] == 'pojs-rspec2'
+    s.add_development_dependency 'rspec', '>= 2.5.0'
     s.add_development_dependency 'rake-tasks'
-    s.add_development_dependency 'rack', "1.1" if ENV["RUBY_VERSION"] =~ /1\.8\.6/
-  elsif ENV['RAILS_VERSION'] == 'rails2'
-    if ENV["RUBY_VERSION"] =~ /1\.8\.6/
-      #1.3.2 buffer overflows
-      s.add_development_dependency 'rspec', '= 1.3.1'
-    else
-      s.add_development_dependency 'rspec', '>= 1.3.1', '< 2'
-    end
-    # for development & test of Rails 2 Generators
-    s.add_development_dependency 'rails', '2.3.11', "< 3"
-  elsif ENV['RAILS_VERSION'] == 'rails2_3_5'
-    if ENV["RUBY_VERSION"] =~ /1\.8\.6/
-      #1.3.2 buffer overflows
-      s.add_development_dependency 'rspec', '= 1.3.1'
-    else
-      s.add_development_dependency 'rspec', '>= 1.3.1', '< 2'
-    end
-    # for development & test of Rails 2 Generators
-    s.add_development_dependency 'rails', '= 2.3.5'
-  else
+  elsif ENV['RAILS_VERSION'] == 'rails3'
     # for development & test of Rails 3 Generators
     s.add_development_dependency 'rspec', '>= 2.5.0'
-    s.add_development_dependency 'rails', '>= 3.0.0'
-    s.add_development_dependency 'rack', '>= 1.2.1'
+    s.add_development_dependency 'rails', '>= 3.0.0', '< 4.0.0'
+    s.add_development_dependency 'sqlite3'
+  else
+    s.add_development_dependency 'rspec', '>= 2.5.0'
+    s.add_development_dependency 'rails', '>= 4'
   end
 
   s.add_development_dependency 'rack-test'
   s.add_development_dependency 'json_pure'
-  s.add_development_dependency 'nokogiri'
 
   s.add_development_dependency 'anchorman'
 
-  s.add_dependency 'jasmine-core', "~> 1.3.1"
-  s.add_dependency 'rack', '~> 1.0'
+  s.add_dependency 'jasmine-core', '~> 2.0.0.alpha'
+  s.add_dependency 'rack'
   s.add_dependency 'rspec', '>= 1.3.1'
   s.add_dependency 'selenium-webdriver', '>= 0.1.3'
+  s.add_dependency 'nokogiri'
 end

data/lib/generators/jasmine/examples/templates/spec/javascripts/helpers/SpecHelper.js

@@ -1,9 +1,15 @@
-beforeEach(function() {
-  this.addMatchers({
-    toBePlaying: function(expectedSong) {
-      var player = this.actual;
-      return player.currentlyPlayingSong === expectedSong
-          && player.isPlaying;
-    }
-  })
-});
+beforeEach(function () {
+    jasmine.Expectation.addMatchers({
+        toBePlaying: function () {
+            return {
+                compare: function (actual, expected) {
+                    var player = actual;
+
+                    return {
+                        pass: player.currentlyPlayingSong === expected && player.isPlaying
+                    }
+                }
+            };
+        }
+    });
+});

data/lib/generators/jasmine/examples/templates/spec/javascripts/jasmine_examples/PlayerSpec.js

@@ -52,7 +52,7 @@ describe("Player", function() {
 
       expect(function() {
         player.resume();
-      }).toThrow("song is already playing");
+      }).toThrowError("song is already playing");
     });
   });
 });

data/lib/jasmine.rb

@@ -6,26 +6,29 @@ jasmine_files = ['base',
                  'application',
                  'server',
                  'selenium_driver',
-                 'rspec_formatter',
                  'command_line_tool',
                  'page',
                  'path_mapper',
-                 'asset_pipeline_utility',
+                 'asset_bundle',
                  'asset_pipeline_mapper',
                  'asset_expander',
                  'results_processor',
                  'results',
                  'path_expander',
                  'yaml_config_parser',
-                 File.join('runners', 'http')]
+                 File.join('formatters', 'base'),
+                 File.join('formatters', 'console'),
+                 File.join('formatters', 'junit_xml'),
+                 File.join('runners', 'http'),
+                 File.join('reporters', 'api_reporter')]
+
 
 jasmine_files.each do |file|
   require File.join('jasmine', file)
 end
-# jasmine_rack_files.each do |file|
-  # require File.join('rack', 'jasmine', file)
-# end
 
-require File.join('jasmine', "railtie") if Jasmine::Dependencies.rails3?
+if Jasmine::Dependencies.rails?
+  require File.join('jasmine', 'railtie')
+end
 
 

data/lib/jasmine/asset_bundle.rb

@@ -0,0 +1,69 @@
+module Jasmine
+
+  class AssetBundle
+    def self.factory
+      if Jasmine::Dependencies.rails3?
+        return Rails3AssetBundle
+      end
+      if Jasmine::Dependencies.rails4?
+        return Rails4AssetBundle
+      end
+    end
+
+    class RailsAssetBundle
+      def initialize(pathname)
+        @pathname = pathname
+      end
+
+      private
+
+      attr_reader :pathname
+    end
+
+    class Rails3AssetBundle < RailsAssetBundle
+
+      def assets
+        context = get_asset_context
+        context.asset_paths.asset_for(pathname, 'js').to_a.map do |path|
+          context.asset_path(path)
+        end
+      end
+
+      private
+      def get_asset_context
+        context = ::Rails.application.assets.context_class
+        context.extend(::Sprockets::Helpers::IsolatedHelper)
+        context.extend(::Sprockets::Helpers::RailsHelper)
+      end
+    end
+
+    class Rails4AssetBundle
+
+      def initialize(pathname)
+        @pathname = pathname
+      end
+
+      def assets
+        context.get_original_assets(pathname)
+      end
+
+      private
+      attr_reader :pathname
+
+      def context
+        return @context if @context
+        @context = ActionView::Base.new
+        @context.instance_eval do
+          def get_original_assets(pathname)
+            lookup_asset_for_path(pathname, :type => :javascript).to_a.map do |processed_asset|
+              path_to_javascript(processed_asset.logical_path)
+            end
+          end
+        end
+        @context
+
+      end
+    end
+  end
+
+end