snapdragon 1.0.0 → 2.0.0

data/lib/snapdragon/suite.rb

@@ -19,6 +19,10 @@ module Snapdragon
       @options.pattern
     end
 
+    def jasmine_ver
+      @options.jasmine_ver
+    end
+
     def spec_files
       spec_file_objs = []
 

data/lib/snapdragon/version.rb

@@ -1,3 +1,3 @@
 module Snapdragon
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end

data/lib/snapdragon/views/run.erb

@@ -1,11 +1,29 @@
-<link rel="stylesheet" type="text/css" href="/jasmine-core/jasmine.css">
-<script type="text/javascript" src="/jasmine-core/jasmine.js"></script>
-<script type="text/javascript" src="/jasmine-core/jasmine-html.js"></script>
+<link rel="stylesheet" type="text/css" href="/jasmine/jasmine.css">
+<script type="text/javascript" src="/jasmine/jasmine.js"></script>
+<script type="text/javascript" src="/jasmine/jasmine-html.js"></script>
+<script type="text/javascript" src="/jasmine/boot.js"></script>
 
 <% if @suite.formatter == "junit" %>
 <script type="text/javascript" src="/resources/SnapdragonJUnitReporter.js"></script>
+<script>
+  var env = jasmine.getEnv();
+  jasmineRequire.console(jasmineRequire, jasmine);
+  var snapdragonJUnitReporter = new jasmine.SnapdragonJUnitReporter({
+    env: env
+  });
+  env.addReporter(snapdragonJUnitReporter);
+</script>
 <% else %>
 <script type="text/javascript" src="/resources/SnapdragonConsoleReporter.js"></script>
+<script>
+  var env = jasmine.getEnv();
+  jasmineRequire.console(jasmineRequire, jasmine);
+  var snapdragonConsoleReporter = new jasmine.SnapdragonConsoleReporter({
+    env: env,
+    showColors: <% if @suite.use_color? %>true<% else %>false<% end %>
+  });
+  env.addReporter(snapdragonConsoleReporter);
+</script>
 <% end %>
 
 <!-- The implementation code the spec files being tested need -->
@@ -17,44 +35,3 @@
 <% @suite.spec_files.each do |spec| %>
 <script type="text/javascript" src="<%= spec.relative_url_path %>"></script>
 <% end %>
-
-<script type="text/javascript">
-  (function() {
-    var jasmineEnv = jasmine.getEnv();
-    jasmineEnv.updateInterval = 1000;
-
-    var htmlReporter = new jasmine.HtmlReporter();
-    jasmineEnv.addReporter(htmlReporter);
-
-    jasmineEnv.specFilter = function(spec) {
-      return htmlReporter.specFilter(spec);
-    };
-
-    <% if @suite.formatter == "junit" %>
-      var snapdragonJUnitReporter = new jasmine.SnapdragonJUnitReporter();
-      jasmineEnv.addReporter(snapdragonJUnitReporter);
-    <% else %>
-      var reporterOptions = {};
-      <% if @suite.use_color? %>
-        reporterOptions.showColors = true;
-      <% end %>
-
-      var snapdragonConsoleReporter = new jasmine.SnapdragonConsoleReporter(reporterOptions);
-      jasmineEnv.addReporter(snapdragonConsoleReporter);
-    <% end %>
-
-    var currentWindowOnload = window.onload;
-
-    window.onload = function() {
-      if (currentWindowOnload) {
-        currentWindowOnload();
-      }
-      execJasmine();
-    };
-
-    function execJasmine() {
-      jasmineEnv.execute();
-    }
-
-  })();
-</script>

data/lib/snapdragon/views/run_v1.erb

@@ -0,0 +1,60 @@
+<link rel="stylesheet" type="text/css" href="/jasmine_v1/jasmine.css">
+<script type="text/javascript" src="/jasmine_v1/jasmine.js"></script>
+<script type="text/javascript" src="/jasmine_v1/jasmine-html.js"></script>
+
+<% if @suite.formatter == "junit" %>
+<script type="text/javascript" src="/resources/SnapdragonJUnitReporter_v1.js"></script>
+<% else %>
+<script type="text/javascript" src="/resources/SnapdragonConsoleReporter_v1.js"></script>
+<% end %>
+
+<!-- The implementation code the spec files being tested need -->
+<% @suite.require_file_relative_url_paths.each do |path| %>
+<script type="text/javascript" src="<%= path %>"></script>
+<% end %>
+
+<!-- The spec files -->
+<% @suite.spec_files.each do |spec| %>
+<script type="text/javascript" src="<%= spec.relative_url_path %>"></script>
+<% end %>
+
+<script type="text/javascript">
+  (function() {
+    var jasmineEnv = jasmine.getEnv();
+    jasmineEnv.updateInterval = 1000;
+
+    var htmlReporter = new jasmine.HtmlReporter();
+    jasmineEnv.addReporter(htmlReporter);
+
+    jasmineEnv.specFilter = function(spec) {
+      return htmlReporter.specFilter(spec);
+    };
+
+    <% if @suite.formatter == "junit" %>
+      var snapdragonJUnitReporter = new jasmine.SnapdragonJUnitReporter();
+      jasmineEnv.addReporter(snapdragonJUnitReporter);
+    <% else %>
+      var reporterOptions = {};
+      <% if @suite.use_color? %>
+        reporterOptions.showColors = true;
+      <% end %>
+
+      var snapdragonConsoleReporter = new jasmine.SnapdragonConsoleReporter(reporterOptions);
+      jasmineEnv.addReporter(snapdragonConsoleReporter);
+    <% end %>
+
+    var currentWindowOnload = window.onload;
+
+    window.onload = function() {
+      if (currentWindowOnload) {
+        currentWindowOnload();
+      }
+      execJasmine();
+    };
+
+    function execJasmine() {
+      jasmineEnv.execute();
+    }
+
+  })();
+</script>

data/lib/snapdragon/web_application.rb

@@ -12,11 +12,19 @@ module Snapdragon
     end
 
     get "/run" do
-      erb :run
+      if @suite.jasmine_ver == "1"
+        erb :run_v1
+      else
+        erb :run
+      end
     end
 
-    get "/jasmine-core/*" do |path|
-      send_file ::File.expand_path(::File.join('../jasmine/lib/jasmine-core', path), ::File.dirname(__FILE__))
+    get "/jasmine/*" do |path|
+      send_file ::File.expand_path(::File.join('../jasmine', path), ::File.dirname(__FILE__))
+    end
+
+    get "/jasmine_v1/*" do |path|
+      send_file ::File.expand_path(::File.join('../jasmine_v1', path), ::File.dirname(__FILE__))
     end
 
     get "/resources/*" do |path|

data/snapdragon.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "capybara", "~> 2.1.0"
-  spec.add_dependency "poltergeist", "~> 1.3.0"
-  spec.add_dependency "sinatra", "~> 1.4.3"
-  spec.add_dependency "launchy", "~> 2.3.0"
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 2.13.0"
+  spec.add_dependency "capybara", "~> 2.2"
+  spec.add_dependency "poltergeist", "~> 1.5"
+  spec.add_dependency "sinatra", "~> 1.4"
+  spec.add_dependency "launchy", "~> 2.4"
+  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "rake", "~> 10.1"
+  spec.add_development_dependency "rspec", "~> 2.14"
 end

data/spec/lib/snapdragon/cli_application_spec.rb

@@ -1,54 +1,55 @@
+require 'spec_helper'
 require_relative '../../../lib/snapdragon/cli_application'
 
 describe Snapdragon::CliApplication do
   describe "#initialize" do
     it "creates an empty Suite" do
-      Snapdragon::Suite.should_receive(:new)
-      Snapdragon::CliApplication.new(stub, stub)
+      expect(Snapdragon::Suite).to receive(:new)
+      Snapdragon::CliApplication.new(double, double)
     end
 
     it "assigns the new Suite to an instance variable" do
-      suite = stub('suite')
-      Snapdragon::Suite.stub(:new).and_return(suite)
-      app = Snapdragon::CliApplication.new(stub, stub)
-      app.instance_variable_get(:@suite).should eq(suite)
+      suite = double('suite')
+      allow(Snapdragon::Suite).to receive(:new).and_return(suite)
+      app = Snapdragon::CliApplication.new(double, double)
+      expect(app.instance_variable_get(:@suite)).to be(suite)
     end
   end
 
   describe "#run" do
-    let(:paths) { stub('paths') }
-    let(:options) { stub('options') }
+    let(:paths) { double('paths') }
+    let(:options) { double('options') }
     subject { Snapdragon::CliApplication.new(options, paths) }
 
     it "creates a capybara session" do
-      suite = stub(filtered?: false)
-      Snapdragon::Suite.stub(:new).and_return(suite)
-      Capybara::Session.should_receive(:new).and_return(stub.as_null_object)
+      suite = double(filtered?: false)
+      allow(Snapdragon::Suite).to receive(:new).and_return(suite)
+      expect(Capybara::Session).to receive(:new).and_return(double.as_null_object)
       subject.run
     end
 
     context "when suite is filtered" do
       before do
-        subject.instance_variable_set(:@suite, stub(:filtered? => true, :spec_query_param => 'some_query_param_spec_filter'))
+        subject.instance_variable_set(:@suite, double(:filtered? => true, :spec_query_param => 'some_query_param_spec_filter'))
       end
 
       it "visits /run with the spec query param in the capybara session" do
-        session = mock(find: nil)
-        Capybara::Session.stub(:new).and_return(session)
-        session.should_receive(:visit).with("/run?spec=some_query_param_spec_filter")
+        session = double(find: nil)
+        allow(Capybara::Session).to receive(:new).and_return(session)
+        expect(session).to receive(:visit).with("/run?spec=some_query_param_spec_filter")
         subject.run
       end
     end
 
     context "when suite is NOT filtered" do
       before do
-        subject.instance_variable_set(:@suite, stub(:filtered? => false))
+        subject.instance_variable_set(:@suite, double(:filtered? => false))
       end
 
       it "visits /run in that capybara session" do
-        session = mock(find: nil)
-        Capybara::Session.stub(:new).and_return(session)
-        session.should_receive(:visit).with('/run')
+        session = double(find: nil)
+        allow(Capybara::Session).to receive(:new).and_return(session)
+        expect(session).to receive(:visit).with('/run')
         subject.run
       end
     end

data/spec/lib/snapdragon/command_line_parser_spec.rb

@@ -4,70 +4,94 @@ require_relative '../../../lib/snapdragon/command_line_parser'
 describe Snapdragon::CommandLineParser do
   describe "#parse" do
     subject { Snapdragon::CommandLineParser }
-    
+
     it "display version information" do
       output = capture_stdout { subject.parse(["-v"]) }
-      output.should match(/\d+\.\d+\.\d+/)
+      expect(output).to match(/\d+\.\d+\.\d+/)
     end
-    
+
     it "exit once version information is displayed" do
-      lambda { hide_stdout { subject.parse(["-v"]) } }.should raise_error(SystemExit)
+      expect { hide_stdout { subject.parse(["-v"]) } }.to raise_error(SystemExit)
     end
-    
+
     it "display usage information" do
       output = capture_stdout { subject.parse(["-h"]) }
-      output.should match(/Usage/)
+      expect(output).to match(/Usage/)
     end
-    
+
     it "exit once usage information is displayed" do
-      lambda { hide_stdout { subject.parse(["-h"]) } }.should raise_error(SystemExit)
+      expect { hide_stdout { subject.parse(["-h"]) } }.to raise_error(SystemExit)
     end
-    
+
     context "no args supplied" do
       it "exit" do
-        lambda { hide_stdout { subject.parse([]) } }.should_not raise_error(SystemExit)
+        expect { hide_stdout { subject.parse([]) } }.not_to raise_error()
       end
     end
-    
+
     context "args supplied" do
       it "continue execution" do
-        lambda { subject.parse(["spec/hello_spec.rb"]) }.should_not raise_error(SystemExit)
+        expect { subject.parse(["spec/hello_spec.rb"]) }.not_to raise_error()
       end
     end
 
     context "when format is provided" do
       it "sets the format value" do
-        subject.parse(["--format", "junit", "spec/hello_spec.rb"]).format.should eq "junit"
+        expect(subject.parse(["--format", "junit", "spec/hello_spec.rb"]).format).to eq "junit"
       end
     end
 
     context "when format is not provided" do
       it "defaults to console" do
-        subject.parse(["spec/hello_spec.rb"]).format.should eq "console"
+        expect(subject.parse(["spec/hello_spec.rb"]).format).to eq "console"
       end
     end
 
     context "when color option is not provided" do
       it "defaults to true" do
-        subject.parse(["spec/hello_spec.rb"]).color.should eq true
+        expect(subject.parse(["spec/hello_spec.rb"]).color).to eq true
       end
     end
 
     context "when no-color option is provided" do
       it "sets the color option" do
-        subject.parse(["--no-color", "spec/hello_spec.rb"]).color.should eq false
+        expect(subject.parse(["-N", "spec/hello_spec.rb"]).color).to eq false
+      end
+
+      it "sets the color option" do
+        expect(subject.parse(["--nocolor", "spec/hello_spec.rb"]).color).to eq false
+      end
+
+      it "sets the color option" do
+        expect(subject.parse(["--nocolour", "spec/hello_spec.rb"]).color).to eq false
       end
     end
-    
+
     context "when pattern is provided" do
       it "sets the pattern value" do
-        subject.parse(["--pattern", "spec/*/*_test.js"]).pattern.should eq "spec/*/*_test.js"
+        expect(subject.parse(["--pattern", "spec/*/*_test.js"]).pattern).to eq "spec/*/*_test.js"
       end
     end
-    
+
     context "when pattern is not provided" do
       it "defaults to 'spec/**/*_spec.js'" do
-        subject.parse([]).pattern.should eq "spec/**/*_spec.js"
+        expect(subject.parse([]).pattern).to eq "spec/**/*_spec.js"
+      end
+    end
+
+    context "when Jasmine version is not provided" do
+      it "defaults to '2'" do
+        expect(subject.parse([]).jasmine_ver).to eq '2'
+      end
+    end
+
+    context "when Jasmine version is provided" do
+      it "defaults to '1'" do
+        expect(subject.parse(['-J1', 'spec/hello_spec.rb']).jasmine_ver).to eq '1'
+      end
+
+      it "defaults to '1'" do
+        expect(subject.parse(['--jasminev1', 'spec/hello_spec.rb']).jasmine_ver).to eq '1'
       end
     end
   end

data/spec/lib/snapdragon/path_spec.rb

@@ -1,28 +1,29 @@
+require 'spec_helper'
 require_relative '../../../lib/snapdragon/path'
 
 describe Snapdragon::Path do
   describe "#initialize" do
     it "stores the raw path in an instance variable" do
       path = Snapdragon::Path.new('some/path:423')
-      path.instance_variable_get(:@raw_path).should eq('some/path:423')
+      expect(path.instance_variable_get(:@raw_path)).to eq('some/path:423')
     end
 
     context "when given a path and line number" do
       it "stores the path in an instance variable" do
         path = Snapdragon::Path.new('some/path:423')
-        path.instance_variable_get(:@path).should eq('some/path')
+        expect(path.instance_variable_get(:@path)).to eq('some/path')
       end
 
       it "stores the line number in an instance variable" do
         path = Snapdragon::Path.new('some/path:423')
-        path.instance_variable_get(:@line_number).should eq(423)
+        expect(path.instance_variable_get(:@line_number)).to eq(423)
       end
     end
 
     context "when given a path" do
       it "stores teh path in an instance variable" do
         path = Snapdragon::Path.new('some/path')
-        path.instance_variable_get(:@path).should eq('some/path')
+        expect(path.instance_variable_get(:@path)).to eq('some/path')
       end
     end
   end
@@ -32,51 +33,51 @@ describe Snapdragon::Path do
 
     context "when does NOT exist" do
       before do
-        path.stub(:exists?).and_return(false)
+        allow(path).to receive(:exists?).and_return(false)
       end
 
       it "returns an empty array" do
-        path.spec_files.should eq([])
+        expect(path.spec_files).to eq([])
       end
     end
 
     context "when does exist" do
       before do
-        path.stub(:exists?).and_return(true)
+        allow(path).to receive(:exists?).and_return(true)
       end
 
       context "when is a directory" do
         before do
-          path.stub(:is_a_directory?).and_return(true)
+          allow(path).to receive(:is_a_directory?).and_return(true)
         end
 
         it "constructs a spec directory" do
-          Snapdragon::SpecDirectory.should_receive(:new).and_return(stub.as_null_object)
+          expect(Snapdragon::SpecDirectory).to receive(:new).and_return(double.as_null_object)
           path.spec_files
         end
 
         it "returns the spec files recursively found in the spec directory" do
-          spec_files = stub
-          spec_dir = stub(spec_files: spec_files)
-          Snapdragon::SpecDirectory.should_receive(:new).and_return(spec_dir)
-          path.spec_files.should eq(spec_files)
+          spec_files = double
+          spec_dir = double(spec_files: spec_files)
+          expect(Snapdragon::SpecDirectory).to receive(:new).and_return(spec_dir)
+          expect(path.spec_files).to eq(spec_files)
         end
       end
 
       context "when is NOT a directory" do
         before do
-          path.stub(:is_a_directory?).and_return(false)
+          allow(path).to receive(:is_a_directory?).and_return(false)
         end
 
         it "constructs a spec file" do
-          Snapdragon::SpecFile.should_receive(:new)
+          expect(Snapdragon::SpecFile).to receive(:new)
           path.spec_files
         end
 
         it "returns an array containing a newly constructed spec file" do
-          spec_file = stub
-          Snapdragon::SpecFile.stub(:new).and_return(spec_file)
-          path.spec_files.should eq([spec_file])
+          spec_file = double
+          allow(Snapdragon::SpecFile).to receive(:new).and_return(spec_file)
+          expect(path.spec_files).to eq([spec_file])
         end
       end
     end
@@ -86,14 +87,14 @@ describe Snapdragon::Path do
     context "when the given raw path has a line number" do
       it "returns true" do
         path = Snapdragon::Path.new('some/path:234')
-        path.has_line_number?.should be_true
+        expect(path.has_line_number?).to be_true
       end
     end
 
     context "when the given raw path does NOT have a line number" do
       it "returns false" do
         path = Snapdragon::Path.new('some/path')
-        path.has_line_number?.should be_false
+        expect(path.has_line_number?).to be_false
       end
     end
   end