js_spec 0.1.0 → 0.2.0

data/CHANGES

@@ -1,3 +1,9 @@
+0.2.0
+- Using Thin as the server
+- Using Selenium to run the browsers
+- Added instructions to run JsSpec on CI
+- Added js_spec as an executable
+
 0.1.0
 - Added RailsServer
 - Better namespacing

data/README

@@ -4,6 +4,28 @@ The JsSpec ruby library is a server runner for the JsSpec javascript library.
 http://code.google.com/p/jsspec/
 http://jania.pe.kr/aw/moin.cgi/JSSpec
 
+== Installing JsSpec
+You can use JsSpec as a gem or as a Rails plugin.
+To install the gem, run:
+  sudo gem install js_spec
+
+To install the plugin, run:
+  script/plugin install svn://rubyforge.org/var/svn/pivotalrb/js_spec/trunk
+
+The Rails plugin gives you generators when using JsSpec in a Rails environment.
+
 == Using JsSpec
 js_spec_server /path/to/your/javascript/spec/files /path/to/your/javascript/implementation/files
-Open your browser to http://localhost:8080/specs
+
+Open your browser to http://localhost:8080/specs or run selenium and then run js_spec
+
+== JsSpec on CI
+JS spec uses the Selenium gem to automatically control browsers on different machines.
+
+To use JsSpec in a CI environment,
+  * Install and run the selenium RC server on the machine that you want to run the browsers by using the command:
+    selenium
+  * Run the js_spec_server on the machine that has the files.
+    script/js_spec_server
+  * Run the js_spec client. The js_spec client has --selenium_host, --selenium_port, and --spec_url arguments to specify
+    where the Selenium server is relative to the js_spec server, and where the js_spec server is relative to the browser.

data/Rakefile

@@ -26,7 +26,7 @@ def run_suite
 end
 
 PKG_NAME = "js_spec"
-PKG_VERSION = "0.1.0"
+PKG_VERSION = "0.2.0"
 PKG_FILES = FileList[
   '[A-Z]*',
   '*.rb',
@@ -45,7 +45,7 @@ spec = Gem::Specification.new do |s|
 
   s.files = PKG_FILES.to_a
   s.require_path = 'lib'
-  s.executables = ['js_spec_server']
+  s.executables = ['js_spec', 'js_spec_server']
 
   s.has_rdoc = true
   s.extra_rdoc_files = [ "README", "CHANGES" ]
@@ -53,11 +53,13 @@ spec = Gem::Specification.new do |s|
 
   s.test_files = Dir.glob('spec/*_spec.rb')
   s.require_path = 'lib'
-  s.autorequire = 'js_spec'
   s.author = "Brian Takita & Nathan Sobo"
   s.email = "brian@pivotallabs.com"
   s.homepage = "http://pivotallabs.com"
   s.rubyforge_project = "pivotalrb"
+  s.add_dependency('Selenium')
+  s.add_dependency('thin')
+  s.add_dependency('uuid')
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/bin/js_spec

@@ -3,8 +3,4 @@
 dir = File.dirname(__FILE__)
 $LOAD_PATH.unshift("#{dir}/../lib")
 require "js_spec"
-require "net/http"
-
-response = Net::HTTP.start(JsSpec::Server::DEFAULT_HOST, JsSpec::Server::DEFAULT_PORT) do |http|
-  http.post('/runners/firefox', {})
-end
+exit JsSpec::Client.run_argv(ARGV)

data/core/JSSpecExtensions.js

@@ -1,20 +1,74 @@
-var Require = {
-  require: function(path_from_javascripts) {
-    if(!Require.required_paths[path_from_javascripts]) {
+function Spec() {
+}
+
+Spec.register = function(spec_constructor) {
+  spec_constructor.describe = function(context, definition) {
+    var custom_before = definition['before each'];
+    if(custom_before) {
+      definition['before each'] = function() {
+        if(spec_constructor['before each']) spec_constructor['before each']();
+        custom_before();
+      }
+    } else {
+      definition['before each'] = function() {
+        if(spec_constructor['before each']) spec_constructor['before each']();
+      };
+    }
+
+    var custom_after = definition['after each'];
+    if(custom_after) {
+      definition['after each'] = function() {
+        custom_after();
+        if(spec_constructor['after each']) spec_constructor['after each']();
+        Spec.reset();
+      }
+    } else {
+      definition['after each'] = function() {
+        if(spec_constructor['after each']) spec_constructor['after each']();
+        Spec.reset();
+      }
+    }
+    new spec_constructor();
+    describe(spec_constructor.name.toString() + context.toString(), definition);
+  }
+}
+
+Spec.reset = function() {}
+
+var Assets = {
+  require: function(path_from_javascripts, onload) {
+    if(!Assets.required_paths[path_from_javascripts]) {
       var full_path = path_from_javascripts + ".js";
-      if (Require.use_cache_buster) {
-        full_path += '?' + Require.cache_buster;
+      if (Assets.use_cache_buster) {
+        full_path += '?' + Assets.cache_buster;
       }
       document.write("<script src='" + full_path + "' type='text/javascript'></script>");
-      Require.required_paths[path_from_javascripts] = true;
+      if(onload) {
+        var scripts = document.getElementsByTagName('script');
+        scripts[scripts.length-1].onload = onload;
+      }
+      Assets.required_paths[path_from_javascripts] = true;
+    }
+  },
+
+  stylesheet: function(path_from_stylesheets) {
+    if(!Assets.included_stylesheets[path_from_stylesheets]) {
+      var full_path = path_from_stylesheets + ".css";
+      if(Assets.use_cache_buster) {
+        full_path += '?' + Assets.cache_buster;
+      }
+      document.write("<link rel='stylesheet' type='text/css' href='" + full_path + "' />");
+      Assets.included_stylesheets[path_from_stylesheets] = true;
     }
   },
 
   required_paths: {},
-  use_cache_buster: true, // TODO: NS/CTI - make this configurable from the UI.
+  included_stylesheets: {},
+  use_cache_buster: false, // TODO: NS/CTI - make this configurable from the UI.
   cache_buster: parseInt(new Date().getTime()/(1*1000))
 }
-var require = Require.require;
+var require = Assets.require;
+var stylesheet = Assets.stylesheet;
 
 var URL_REGEX = /^((\w+):\/\/)(([^:]+):?([^@]+)?@)?([^\/\?:]*):?(\d+)?(\/?[^\?#]+)?\??([^#]+)?#?(.+)?/;
 function parse_url(url) {
@@ -37,21 +91,16 @@ function parse_url(url) {
 JSSpec.Logger.prototype.onRunnerEndWithoutServerNotification = JSSpec.Logger.prototype.onRunnerEnd;
 JSSpec.Logger.prototype.onRunnerEndWithServerNotification = function() {
   this.onRunnerEndWithoutServerNotification();
-  var data = {
-    'text': this.get_error_message_text()
-  };
-
-  current_location_params = parse_url(window.location.href);
-  if(current_location_params.guid) {
-    data.guid = current_location_params.guid;
-  }
-  jQuery.realAjax({
-    type: 'POST',
-    url: '/suites/1/finish',
-    data: data
-  });
+  var xml = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
+  xml.open("POST", '/suites/1/finish', true);
+  xml.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+  var body = [];
+  body.push(encodeURIComponent("guid") + "=" + encodeURIComponent( JSSpec.guid ));
+  body.push(encodeURIComponent("text") + "=" + encodeURIComponent( this.get_error_message_text() ));
+  xml.send(body.join("&"));
 }
 JSSpec.Logger.prototype.onRunnerEnd = JSSpec.Logger.prototype.onRunnerEndWithServerNotification;
+JSSpec.guid = null;
 
 JSSpec.Logger.prototype.get_error_message_text = function() {
   var error_messages = [];
@@ -140,7 +189,3 @@ JSSpec.DSL.Subject.prototype.should_not_raise = function(expected) {
     throw JSSpec._assertionFailure;
   }
 }
-
-
-
-