jasmine-fixtures 0.1.4 → 0.1.5

data/.gitignore

@@ -20,3 +20,4 @@ pkg
 
 ## PROJECT::SPECIFIC
 .rvmrc
+.idea

data/.pairs

@@ -2,6 +2,7 @@ pairs:
   jb: Jonathan Barnes; jonathan
   jbs: JB Steadman; jb
   rn: Roger Neel
+  ac: Andrew Cantino
 email:
   prefix: pair
   domain: mavenlink.com

data/Gemfile

@@ -1,7 +1,8 @@
 source :gemcutter
 
-gem 'bundler',        '1.0.3'
+gem 'bundler',        '>=1.0'
 gem 'jeweler',        '1.4.0'
-gem 'nokogiri'
+gem 'nokogiri',       ">=1.4"
 gem 'rake',           '0.8.7'
-gem 'rspec-rails',    '1.3.3'
+gem 'rspec',          '1.3.1'
+gem 'rspec-rails',    '1.3.3'

data/Gemfile.lock

@@ -22,8 +22,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (= 1.0.3)
+  bundler (>= 1.0)
   jeweler (= 1.4.0)
-  nokogiri
+  nokogiri (>= 1.4)
   rake (= 0.8.7)
+  rspec (= 1.3.1)
   rspec-rails (= 1.3.3)

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Jonathan Barnes & Roger Neel
+Copyright (c) 2010
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -6,12 +6,14 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "jasmine-fixtures"
     gem.summary = %Q{Jasmine Fixtures allow you to use real DOM to test your JavaScript}
-    gem.description = %Q{Dump out DOM that you want to test. Use jasmine-fixtures to load that DOM into your Jasmine specs. See github.com/mavenlink/jasmine-fixtures for more.}
+    gem.description = %Q{Dump out DOM that you want to test. Use jasmine-fixtures to load that DOM into your Jasmine specs. See http://github.com/mavenlink/jasmine-fixtures for more.}
     gem.email = "roger@mavenlink.com"
     gem.homepage = "http://github.com/mavenlink/jasmine-fixtures"
-    gem.authors = ["Roger Neel", "Jonathan Barnes", "JB Steadman"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.authors = ["Roger Neel", "Jonathan Barnes", "JB Steadman", "Andrew Cantino"]
+    gem.add_development_dependency "rspec", "~>1.3"
+    gem.add_development_dependency "rspec-rails", "~>1.3"
     gem.add_dependency "nokogiri", ">= 1.4.0"
+    gem.add_dependency "jasmine", ">= 1.0.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/generators/jasmine-fixtures/jasmine_fixtures_generator.rb

@@ -4,8 +4,7 @@ class JasmineFixturesGenerator < Rails::Generator::Base
       m.directory "spec/javascripts/helpers"
       m.file "spec/javascripts/helpers/jasmine-fixture-helper.js", "spec/javascripts/helpers/jasmine-fixture-helper.js"
       m.file "spec/javascripts/helpers/jasmine-fixture-loader.js", "spec/javascripts/helpers/jasmine-fixture-loader.js"
-      m.file "spec/javascripts/helpers/jasmine-fixture-matchers.js", "spec/javascripts/helpers/jasmine-fixture-matchers.js"
-      
+
       m.directory "spec/support"
       m.file "spec/support/jasmine_fixture_generator_methods.rb", "spec/support/jasmine_fixture_generator_methods.rb"
       
@@ -14,4 +13,4 @@ class JasmineFixturesGenerator < Rails::Generator::Base
       m.readme "INSTALL"
     end
   end
-end
+end

data/generators/jasmine-fixtures/templates/INSTALL

@@ -1,7 +1,6 @@
 Jasmine Fixtures have been installed!
 
-We copied JasmineFixtureHelper.js and LoadFixture.js into your spec/javascripts/helpers dir. In its default configuration, Jasmine should pick these files up. 
+We copied the required files into your spec directory.
+In its default configuration, Jasmine and RSpec should pick these files up.
 
-Next step is to run: script/generate jasmine_fixtures
-
-Take a look at https://github.com/mavenlink/jasmine-fixtures for tips & more info.
+Take a look at https://github.com/mavenlink/jasmine-fixtures for tips & more info.

data/generators/jasmine-fixtures/templates/spec/controllers/jasmine_fixture_creators.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 #####
 # Modify this file to create new Jasmine Fixtures!
@@ -11,19 +11,36 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 #####
 
 ##### Using save_fixture
-# html_for will only take the <body> tag and replace it with a <div>
-# to avoid nested <body> tags within the jasmine runner
+# html_for will take the <body> tag and replace it with a <div>
+# to avoid nested <body> tags within the Jasmine runner
 
 # If you have custom responses (ajax partials, JSON, etc),
-# you can subvert this and use response.body or whatever.
+# you can subvert this and use response.body or whatever is appropriate.
 #####
 
 
-##### Example
+##### Examples
 describe UsersController do
+  #You need to integrate_views in each of your describes to get the content of the response
+  integrate_views
+
+  #Example of a standard request that would use html_for to strip <body>
   it "generates a new user page" do
     get :new
     response.should be_success
     save_fixture(html_for('body'), 'user-signup-page')
   end
-end
+
+  #Example of a logged-in ajax request that doesn't have a body tag to strip out
+  describe "a user's profile" do
+    before do
+      log_in users(:james)
+    end
+
+    it "generates a new user profile xhr" do
+      xhr :get, :show, :id => users(:james).to_param
+      response.should be_success
+      save_fixture(response.body, 'user-profile-page')
+    end
+  end
+end

data/generators/jasmine-fixtures/templates/spec/javascripts/helpers/jasmine-fixture-helper.js

@@ -1,3 +1,7 @@
+if (typeof spec === 'undefined') {
+  var spec = {};
+}
+
 beforeEach(function() {
   $('#jasmine_content').empty();
   spec.cleanupHooks();
@@ -7,16 +11,11 @@ afterEach(function() {
   spec.cleanupHooks();
   expect(spec.loadFixtureCount).toBeLessThan(2);
   spec.loadFixtureCount = 0;
-  expect($('.ui-dialog').length).toEqual(0);
-  expect($('.ui-autocomplete-results').length).toEqual(0);
 });
 
 spec.cleanupHooks = function() {
-  // clearLiveEventBindings is helpful if using jQuery live events
-	// uncomment if you'd like
+  // clearLiveEventBindings is helpful if using jQuery live events, uncomment if you'd like to use it.
 	// spec.clearLiveEventBindings();
-	
-  window.onbeforeunload = null;
 };
 
 spec.clearLiveEventBindings = function() {
@@ -28,4 +27,4 @@ spec.clearLiveEventBindings = function() {
 
 spec.content = function() {
   return $('#jasmine_content');
-};
+};

data/generators/jasmine-fixtures/templates/spec/javascripts/helpers/jasmine-fixture-loader.js

@@ -9,13 +9,12 @@ spec.loadFixture = function(fixtureName) {
   // get the markup, inject it into the dom
   $destination.html(spec.fixtureHtml(fixtureName) + indicatorScript);
   while (uniqueLoadIndicator != "loaded") {
-    if (console) console.log("FireFox wasn't ready... sleeping.");
+    //
+    if (console) console.log("Browser wasn't ready... sleeping.");
     spec.retrieveFixture(fixtureName);
   }
   uniqueLoadIndicator = null;
 
-  bindBehaviors();
-
   // keep track of fixture count to fail specs that
   // call loadFixture() more than once
   spec.loadFixtureCount++;

data/generators/jasmine-fixtures/templates/spec/support/jasmine_fixture_generator_methods.rb

@@ -22,11 +22,11 @@ Spec::Rails::Example::ControllerExampleGroup.class_eval do
     remove_third_party_scripts(doc)
     content = doc.css(selector).first.to_s
 
-    return convert_body_tag_to_div(content)
+    convert_body_tag_to_div(content)
   end
 
-  # Remove scripts such as Google Analytics to avoid running them
-  # when we load into the dom during js specs.
+  # Recommended that you add all body-level third party scripts inside a div called #third-party-scripts
+  # so that they can be removed during testing.
   def remove_third_party_scripts(doc)
     scripts = doc.at('#third-party-scripts')
     scripts.remove if scripts
@@ -40,6 +40,6 @@ Spec::Rails::Example::ControllerExampleGroup.class_eval do
   # Here we convert the body tag to a div so that we can load it into
   # the document running js specs without embedding a <body> within a <body>.
   def convert_body_tag_to_div(markup)
-    return markup.gsub("<body", '<div').gsub("</body>", "</div>")
+    markup.gsub("<body", '<div').gsub("</body>", "</div>")
   end
 end

data/jasmine-fixtures.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jasmine-fixtures}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Roger Neel", "Jonathan Barnes", "JB Steadman"]
-  s.date = %q{2010-11-07}
-  s.description = %q{Dump out DOM that you want to test. Use jasmine-fixtures to load that DOM into your Jasmine specs. See github.com/mavenlink/jasmine-fixtures for more.}
+  s.authors = ["Roger Neel", "Jonathan Barnes", "JB Steadman", "Andrew Cantino"]
+  s.date = %q{2010-11-08}
+  s.description = %q{Dump out DOM that you want to test. Use jasmine-fixtures to load that DOM into your Jasmine specs. See http://github.com/mavenlink/jasmine-fixtures for more.}
   s.email = %q{roger@mavenlink.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -32,7 +32,6 @@ Gem::Specification.new do |s|
      "generators/jasmine-fixtures/templates/spec/controllers/jasmine_fixture_creators.rb",
      "generators/jasmine-fixtures/templates/spec/javascripts/helpers/jasmine-fixture-helper.js",
      "generators/jasmine-fixtures/templates/spec/javascripts/helpers/jasmine-fixture-loader.js",
-     "generators/jasmine-fixtures/templates/spec/javascripts/helpers/jasmine-fixture-matchers.js",
      "generators/jasmine-fixtures/templates/spec/support/jasmine_fixture_generator_methods.rb",
      "jasmine-fixtures.gemspec",
      "lib/jasmine-fixtures.rb",
@@ -55,15 +54,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_development_dependency(%q<rspec-rails>, ["~> 1.3"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.0"])
+      s.add_runtime_dependency(%q<jasmine>, [">= 1.0.0"])
     else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_dependency(%q<rspec-rails>, ["~> 1.3"])
       s.add_dependency(%q<nokogiri>, [">= 1.4.0"])
+      s.add_dependency(%q<jasmine>, [">= 1.0.0"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<rspec>, ["~> 1.3"])
+    s.add_dependency(%q<rspec-rails>, ["~> 1.3"])
     s.add_dependency(%q<nokogiri>, [">= 1.4.0"])
+    s.add_dependency(%q<jasmine>, [">= 1.0.0"])
   end
 end
 

metadata

@@ -1,23 +1,24 @@
 --- !ruby/object:Gem::Specification 
 name: jasmine-fixtures
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Roger Neel
 - Jonathan Barnes
 - JB Steadman
+- Andrew Cantino
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-11-07 00:00:00 -07:00
+date: 2010-11-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,20 +27,34 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 9
         segments: 
         - 1
-        - 2
-        - 9
-        version: 1.2.9
+        - 3
+        version: "1.3"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: rspec-rails
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -51,8 +66,24 @@ dependencies:
         - 0
         version: 1.4.0
   type: :runtime
-  version_requirements: *id002
-description: Dump out DOM that you want to test. Use jasmine-fixtures to load that DOM into your Jasmine specs. See github.com/mavenlink/jasmine-fixtures for more.
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: jasmine
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id004
+description: Dump out DOM that you want to test. Use jasmine-fixtures to load that DOM into your Jasmine specs. See http://github.com/mavenlink/jasmine-fixtures for more.
 email: roger@mavenlink.com
 executables: []
 
@@ -77,7 +108,6 @@ files:
 - generators/jasmine-fixtures/templates/spec/controllers/jasmine_fixture_creators.rb
 - generators/jasmine-fixtures/templates/spec/javascripts/helpers/jasmine-fixture-helper.js
 - generators/jasmine-fixtures/templates/spec/javascripts/helpers/jasmine-fixture-loader.js
-- generators/jasmine-fixtures/templates/spec/javascripts/helpers/jasmine-fixture-matchers.js
 - generators/jasmine-fixtures/templates/spec/support/jasmine_fixture_generator_methods.rb
 - jasmine-fixtures.gemspec
 - lib/jasmine-fixtures.rb

data/generators/jasmine-fixtures/templates/spec/javascripts/helpers/jasmine-fixture-matchers.js

@@ -1,253 +0,0 @@
-jasmine.Matchers.prototype.toBeSameJqueryObjectAs = function(expected) {
-  var error_message = null;
-  if(!expected || !this.actual || this.actual.length != expected.length) {
-    error_message = "Expected to have same number of matching elements";
-  } else {
-    for(var i = 0; i < expected.length; i++) {
-      if (this.actual.get(i) != expected.get(i)) {
-        error_message = "Expected the elements to be the same but were not";
-        break;
-      }
-    }
-  }
-  return this.report(error_message == null, error_message);
-};
-
-jasmine.Matchers.prototype.toNotBeSameJqueryObjectAs = function(expected) {
-  var error_message = null;
-  if(!expected || !this.actual || this.actual.length != expected.length) {
-    error_message = "Expected to have same number of matching elements";
-  } else {
-    for(var i = 0; i < expected.length; i++) {
-      if (this.actual.get(i) == expected.get(i)) {
-        error_message = "Expected the elements to not be the same but they were";
-        break;
-      }
-    }
-  }
-  return this.report(error_message == null, error_message);
-};
-
-jasmine.Matchers.prototype.toBeCleared = function() {
-  var $form = this.actual;
-  expect($form).toBeSingleton();
-  var $textfields = $form.find('input[type=text]');
-  $textfields.each(function() {
-    expect($(this).val()).toEqual('');
-  });
-  var $textareas = $form.find('textarea');
-  $textareas.each(function() {
-    expect($(this).val()).toEqual('');
-  });
-};
-
-jasmine.Matchers.prototype.toBeSingleton = function() {
-  var $element = this.actual;
-  expect($element.length).toEqual(1);
-};
-
-jasmine.Matchers.prototype.toContainText = function(expected) {
-  var actual = $(this.actual);
-  return this.report(
-    actual.text().indexOf(expected) != -1,
-    "Expected $('" + actual.selector + "') to contain text " + expected
-  );
-};
-
-jasmine.Matchers.prototype.toNotContainText = function(expected) {
-  var actual = $(this.actual);
-  return this.report(
-    actual.text().indexOf(expected) == -1,
-    "Expected $('" + actual.selector + "') to not contain text " + expected
-  );
-};
-
-jasmine.Matchers.prototype.toNotBeChecked = function() {
-  var actual = $(this.actual);
-  return this.report(
-    !actual.is(':checked'),
-    "Expected $('" + actual.selector + "') to not be checked"
-  );
-};
-
-jasmine.Matchers.prototype.toBeChecked = function() {
-  var actual = $(this.actual);
-  return this.report(
-    actual.is(':checked'),
-    "Expected $('" + actual.selector + "') to be checked"
-  );
-};
-
-jasmine.Matchers.prototype.toExist = function() {
-  var actual = $(this.actual);
-  return this.report(
-    actual.length > 0,
-    "Expected $('" + actual.selector + "') to exist but didn't"
-  );
-};
-
-jasmine.Matchers.prototype.toNotExist = function() {
-  var actual = $(this.actual);
-  return this.report(
-    actual.length == 0,
-    "Expected $('" + actual.selector + "') to not exist but it did"
-  );
-};
-
-jasmine.Matchers.prototype.toContainSelector = function(expected) {
-  var actual = $(this.actual);
-  var children = actual.find(expected);
-  return this.report(
-    children.length > 0,
-    "Expected [" + jasmine.util.htmlEscape(actual.html()) + "] to contain selector [" + $(expected).selector + "] but didn't"
-  );
-};
-
-jasmine.Matchers.prototype.toNotContainSelector = function(expected) {
-  var actual = $(this.actual);
-  var children = actual.find(expected);
-  return this.report(
-    children.length == 0,
-    "Expected [" + jasmine.util.htmlEscape(actual.html()) + "] to not contain selector [" + $(expected).selector + "] but it did"
-  );
-};
-
-jasmine.Matchers.prototype.toBeVisible = function() {
-  var actual = $(this.actual);
-  var basicMessage = "be visible";
-  return this._reportWithNonExistant(
-    actual.is(':visible'),
-    basicMessage,
-    "Expected '" + actual.selector + "' to " + basicMessage + " but was not"
-  );
-};
-
-jasmine.Matchers.prototype.toNotBeVisible = function() {
-  var actual = $(this.actual);
-  var basicMessage = "be hidden";
-  return this._reportWithNonExistant(
-    !actual.is(':visible'),
-    basicMessage,
-    "Expected '" + actual.selector + "' to " + basicMessage + " but was not"
-  );
-};
-
-jasmine.Matchers.prototype.toNotBeDisplayed = function() {
-  var actual = $(this.actual);
-  var basicMessage = "be display none";
-  return this._reportWithNonExistant(
-    actual.css("display") == "none",
-    basicMessage,
-    "Expected '" + actual.selector + "' to " + basicMessage + " but was not"
-  );
-};
-
-jasmine.Matchers.prototype.toBeDisplayed = function() {
-  var actual = $(this.actual);
-  var basicMessage = "not be display none";
-  return this._reportWithNonExistant(
-    actual.css("display") != "none",
-    basicMessage,
-    "Expected '" + actual.selector + "' to " + basicMessage + " but was"
-  );
-};
-
-jasmine.Matchers.prototype.toBeEmpty= function() {
-  var actual = $(this.actual);
-  var basicMessage = "be empty";
-  return this._reportWithNonExistant(
-    actual.html() == "",
-    basicMessage,
-    "Expected '" + actual.selector + "' to " + basicMessage + " but was not"
-  );
-};
-
-jasmine.Matchers.prototype.toNotBeEmpty= function() {
-  var actual = $(this.actual);
-  var basicMessage = "not be empty";
-  return this._reportWithNonExistant(
-    actual.html() != "",
-    basicMessage,
-    "Expected '" + actual.selector + "' to " + basicMessage + " but it was"
-  );
-};
-
-jasmine.Matchers.prototype.toHaveClass= function(expected) {
-  var actual = $(this.actual);
-  var basicMessage = "have class " + expected;
-  return this._reportWithNonExistant(
-    actual.hasClass(expected),
-    basicMessage,
-    "Expected '" + actual.selector + "' to " + basicMessage + " but does not"
-  );
-};
-
-jasmine.Matchers.prototype.toNotHaveClass= function(expected) {
-  var actual = $(this.actual);
-  var basicMessage = "not have class " + expected;
-  return this._reportWithNonExistant(
-    !actual.hasClass(expected),
-    basicMessage,
-    "Expected '" + actual.selector + "' to " + basicMessage + " but it does"
-  );
-};
-
-jasmine.Matchers.prototype.toBeDisabled= function() {
-  var actual = $(this.actual);
-  var basicMessage = "be disabled";
-  return this._reportWithNonExistant(
-    actual.is(":disabled"),
-    basicMessage,
-    "Expected '" + actual.selector + "' to " + basicMessage + " but was not"
-  );
-};
-
-jasmine.Matchers.prototype.toBeEnabled= function() {
-  var actual = $(this.actual);
-  var basicMessage = "be enabled";
-  return this._reportWithNonExistant(
-    actual.is(":enabled"),
-    basicMessage,
-    "Expected '" + actual.selector + "' to " + basicMessage + " but was not"
-  );
-};
-
-jasmine.Matchers.prototype.toBeTag= function(tagName) {
-  var actual = $(this.actual);
-  var basicMessage = "be a tag of type '" + tagName + "'";
-  var actualTagName = "your element";
-  if(actual.length > 0) {
-    actualTagName = actual.get(0).tagName.toLowerCase();
-  }
-  return this._reportWithNonExistant(
-    actual.is(tagName),
-    basicMessage,
-    "Expected '" + actualTagName + "' to " + basicMessage + " but was not"
-  );
-};
-
-jasmine.Matchers.prototype.toHaveAttribute= function(attr, value) {
-  var actual = $(this.actual);
-  var basicMessage = "have attribute '" + attr + "' with value '" + value + "'";
-  var actualValue = actual.attr(attr);
-  return this._reportWithNonExistant(
-    actualValue == value,
-    basicMessage,
-    "Expected '" + actual.selector + "' to " + basicMessage + " but instead had '" + actualValue + "'"
-  );
-};
-
-jasmine.Matchers.prototype._reportWithNonExistant = function(test, basicMesage, fullMessage) {
-  var actual = $(this.actual);
-  if(actual.length > 0) {
-    return this.report(
-      test,
-      fullMessage
-    );
-  } else {
-    return this.report(
-      false,
-      "Expected '" + actual.selector + "' to "+ basicMesage +" but the element didn't exist."
-    );
-  }
-};