teaspoon 0.7.4 → 0.7.5

data/spec/features/console_reporter_spec.rb

@@ -24,6 +24,7 @@ Failures:
   end
 
   scenario "displays coverage information" do
+    pending "broken with rails 4"
     pending("needs istanbul to be installed") unless Teaspoon::Instrumentation.which('istanbul')
     run_simple("bundle exec teaspoon -r ../../spec/teaspoon_env --suite=default app/assets/javascripts/integration/integration_spec.coffee --coverage-reports=text", false)
 

data/spec/features/instrumentation_spec.rb

@@ -7,6 +7,7 @@ feature "instrumenting javascript" do
   end
 
   scenario "requesting with instrument=true adds istanbul instrumentation" do
+    pending "broken with rails 4"
     visit "/assets/instrumented1.js?instrument=true"
     expect(html).to include("if (typeof __coverage__ === 'undefined') { __coverage__ = {}; }")
   end

data/spec/javascripts/teaspoon/jasmine/spec_jspec.coffee

@@ -0,0 +1,3 @@
+describe "Teaspoon running Jasmine", ->
+
+  it "allows pending specs"

data/spec/javascripts/teaspoon/mocha/spec_mspec.coffee

@@ -0,0 +1,9 @@
+describe "Teaspoon running Mocha", ->
+
+  it "allows pending specs"
+
+  it "displays spec times", ->
+
+  it "can delay assertions", (run) ->
+    setTimeout((-> run()), 1800)
+

data/spec/teaspoon/command_line_spec.rb

@@ -6,8 +6,8 @@ describe Teaspoon::CommandLine do
 
   describe "#initialize" do
 
-    let(:console) { mock(execute: false) }
-    let(:parser) { mock(parse!: ["file1", "file2"]) }
+    let(:console) { double(execute: false) }
+    let(:parser) { double(parse!: ["file1", "file2"]) }
 
     before do
       Teaspoon::CommandLine.any_instance.stub(:abort)

data/spec/teaspoon/console_spec.rb

@@ -3,7 +3,7 @@ require "teaspoon/console"
 
 describe Teaspoon::Console do
 
-  let(:server) { mock(start: nil, url: "http://url.com") }
+  let(:server) { double(start: nil, url: "http://url.com") }
   subject {
     Teaspoon::Console.any_instance.stub(:start_server)
     instance = Teaspoon::Console.new
@@ -66,7 +66,19 @@ describe Teaspoon::Console do
 
       suites = subject.send(:suites)
       expect(suites).to eq(["foo"])
-      expect(subject.send(:filter, "foo")).to eq("?file[]=file2")
+      expect(subject.send(:filter, "foo")).to eq("file[]=file2")
+    end
+
+    it "resolves the files if a directory was given" do
+      directory = [ "test/javascripts" ]
+      resolve_spec_for_output = ['test/javascripts/foo.coffee', 'test/javascripts/bar.coffee']
+      Teaspoon::Suite.should_receive(:resolve_spec_for).with("test/javascripts").and_return(suite: "foo", path: resolve_spec_for_output)
+      subject.execute(nil, directory)
+      expect(subject.instance_variable_get(:@files)).to eq(directory)
+
+      suites = subject.send(:suites)
+      expect(suites).to eq(["foo"])
+      expect(subject.send(:filter, "foo")).to eq("file[]=#{resolve_spec_for_output.join('&file[]=')}")
     end
 
     it "runs the tests" do
@@ -90,7 +102,7 @@ describe Teaspoon::Console do
   describe "#run_specs" do
 
     it "calls run_specs on the driver" do
-      driver = mock(run_specs: nil)
+      driver = double(run_specs: nil)
       subject.should_receive(:driver).and_return(driver)
       driver.should_receive(:run_specs).with(:suite_name, "http://url.com/teaspoon/suite_name?reporter=Console", nil)
       subject.run_specs(:suite_name)

data/spec/teaspoon/coverage_spec.rb

@@ -19,7 +19,7 @@ describe Teaspoon::Coverage do
     end
 
     it "writes the data to a file" do
-      file = mock('file')
+      file = double('file')
       File.should_receive(:open).with(@output, "w").and_yield(file)
       file.should_receive(:write).with('{"foo":"bar"}')
       subject.reports

data/spec/teaspoon/drivers/phantomjs_driver_spec.rb

@@ -10,7 +10,7 @@ describe Teaspoon::Drivers::PhantomjsDriver do
     end
 
     it "instantiates the formatter" do
-      runner = mock(failure_count: nil)
+      runner = double(failure_count: nil)
       Teaspoon::Runner.should_receive(:new).and_return(runner)
       subject.run_specs(:default, "_url_")
     end

data/spec/teaspoon/drivers/selenium_driver_spec.rb

@@ -6,21 +6,21 @@ describe Teaspoon::Drivers::SeleniumDriver do
   describe "#run_specs" do
 
     before do
-      @navigate = mock(to: nil)
-      @driver = mock(quit: nil, navigate: @navigate, execute_script: nil)
+      @navigate = double(to: nil)
+      @driver = double(quit: nil, navigate: @navigate, execute_script: nil)
       Selenium::WebDriver.stub(:for).and_return(@driver)
-      @wait = mock(until: nil)
+      @wait = double(until: nil)
       Selenium::WebDriver::Wait.stub(:new).and_return(@wait)
     end
 
     it "instantiates the formatter" do
-      runner = mock(failure_count: nil)
+      runner = double(failure_count: nil)
       Teaspoon::Runner.should_receive(:new).and_return(runner)
       subject.run_specs(:default, "_url_")
     end
 
     it "returns the number of failures from the runner" do
-      runner = mock(failure_count: 42)
+      runner = double(failure_count: 42)
       Teaspoon::Runner.should_receive(:new).and_return(runner)
       expect(subject.run_specs(:default, "_url_")).to be(42)
     end

data/spec/teaspoon/environment_spec.rb

@@ -54,7 +54,7 @@ describe Teaspoon::Environment do
     end
 
     it "raises if no env file was found" do
-      File.should_receive(:exists?).any_number_of_times.and_return(false)
+      File.stub(:exists?)
       expect{ subject.require_environment }.to raise_error(Teaspoon::EnvironmentNotFound)
     end
   end

data/spec/teaspoon/formatters/base_formatter_spec.rb

@@ -21,9 +21,9 @@ describe Teaspoon::Formatters::BaseFormatter do
   describe "#log_coverage" do
 
     it "logs the coverage information" do
-      mock = mock(reports: nil)
-      Teaspoon::Coverage.should_receive(:new).with("_data_").and_return(mock)
-      mock.should_receive(:reports).and_return("_reports_")
+      double = double(reports: nil)
+      Teaspoon::Coverage.should_receive(:new).with("_data_").and_return(double)
+      double.should_receive(:reports).and_return("_reports_")
       STDOUT.should_receive(:print).with("_reports_")
       subject.send(:log_coverage, "_data_")
     end

data/spec/teaspoon/instrumentation_spec.rb

@@ -7,7 +7,7 @@ describe Teaspoon::Instrumentation do
 
   subject { Teaspoon::Instrumentation }
 
-  let(:asset) { mock(source: nil) }
+  let(:asset) { double('asset', source: nil, pathname: 'path/to/instrument.js') }
   let(:response) { [200, {"Content-Type" => "application/javascript"}, asset] }
   let(:env) { {"QUERY_STRING" => "instrument=true"} }
 
@@ -66,11 +66,12 @@ describe Teaspoon::Instrumentation do
 
   describe ".add_to" do
 
-    let(:asset) { mock(source: source, pathname: 'path/to/instrument.js') }
+    let(:asset) { double(source: source, pathname: 'path/to/instrument.js') }
     let(:source) { "function add(a, b) { return a + b } // ☃ " }
 
     before do
       Teaspoon::Instrumentation.stub(:add?).and_return(true)
+      asset.should_receive(:clone).and_return(asset)
 
       File.stub(:open)
       subject.any_instance.stub(:instrument).and_return(source + " // instrumented")
@@ -82,7 +83,7 @@ describe Teaspoon::Instrumentation do
     end
 
     it "writes the file to a tmp path" do
-      file = mock('file')
+      file = double('file')
       File.should_receive(:open).with(@output, "w").and_yield(file)
       file.should_receive(:write).with("function add(a, b) { return a + b } // ☃ ")
       subject.add_to(response, env)

data/spec/teaspoon/runner_spec.rb

@@ -31,7 +31,7 @@ describe Teaspoon::Runner do
 
     it "asks each formatter if it needs to suppress logs" do
       Teaspoon.configuration.should_receive(:suppress_log).and_return(false)
-      subject.formatters = [mock(suppress_logs?: true)]
+      subject.formatters = [double(suppress_logs?: true)]
       expect(subject.suppress_logs?).to be(true)
     end
 

data/spec/teaspoon/server_spec.rb

@@ -24,7 +24,7 @@ describe Teaspoon::Server do
 
     it "starts a rack server" do
       STDOUT.should_receive(:print).with("Starting the Teaspoon server...\n")
-      server = mock(start: nil)
+      server = double(start: nil)
       Thread.stub(:new) { |&b| @block = b }
 
       Rack::Server.should_receive(:new).and_return(server)
@@ -53,7 +53,7 @@ describe Teaspoon::Server do
 
         Rack::Server.should_receive(:new) do |options|
           options.should include(:server => :cgi)
-        end.and_return(mock(start: nil))
+        end.and_return(double(start: nil))
 
         subject.start
         @block.call
@@ -78,11 +78,11 @@ describe Teaspoon::Server do
   describe "#responsive?" do
 
     before do
-      subject.instance_variable_set(:@thread, mock(join: nil))
+      subject.instance_variable_set(:@thread, double(join: nil))
     end
 
     it "checks a local port to see if a server is running" do
-      socket = mock(close: nil)
+      socket = double(close: nil)
       TCPSocket.should_receive(:new).with("127.0.0.1", 31337).and_return(socket)
       socket.should_receive(:close)
       subject.wait_until_started

data/spec/teaspoon/suite_spec.rb

@@ -24,7 +24,14 @@ describe Teaspoon::Suite do
     it "return a hash with the suite name and path" do
       results = Teaspoon::Suite.resolve_spec_for("fixture_spec")
       expect(results[:suite]).to eq("default")
-      expect(results[:path]).to include("base/fixture_spec.")
+      expect(results[:path].first).to include("base/fixture_spec.")
+    end
+
+    it "returns a hash with the suite name and an array of paths if a directory is given" do
+      results = Teaspoon::Suite.resolve_spec_for("base")
+      expect(results[:suite]).to eq("default")
+      dirs = ["base/fixture_spec.", "base/runner_spec.", "base/teaspoon_spec"]
+      expect(dirs.all? { |path| results[:path].grep(/#{path}/)[0] }).to be_true
     end
 
   end
@@ -51,12 +58,6 @@ describe Teaspoon::Suite do
 
   end
 
-  describe "#use_require" do
-    it "returns an boolean" do
-      expect(subject.use_require).to eq(false)
-    end
-  end
-
   describe "#stylesheets" do
 
     it "returns an array of stylesheets" do
@@ -109,21 +110,17 @@ describe Teaspoon::Suite do
   end
 
   describe "#spec_javascripts_for_require" do
+
+    let(:files) { ['/path/file1.js.coffee', 'path/file2.coffee', 'file3.coffee.erb', 'file4.js.erb' ] }
+
     before do
-      subject.should_receive(:specs).and_return(%w(
-                                                    test/js_ext.js.coffee
-                                                    test/coffee_ext.coffee
-                                                    test/coffee_and_erb_ext.coffee.erb
-                                                    test/js_and_erb_ext.js.erb
-      ))
+      subject.should_receive(:specs).and_return(files)
     end
+
     it 'returns an array of spec javascripts without .js and Teaspoon prefix' do
-      result = subject.spec_javascripts_for_require
-      expect(result[0]).to eq 'test/js_ext'
-      expect(result[1]).to eq 'test/coffee_ext'
-      expect(result[2]).to eq 'test/coffee_and_erb_ext'
-      expect(result[3]).to eq 'test/js_and_erb_ext'
+      expect( subject.spec_javascripts_for_require ).to eq(['/path/file1', 'path/file2', 'file3', 'file4'])
     end
+
   end
 
   describe "#suites" do
@@ -195,8 +192,8 @@ describe Teaspoon::Suite do
       expect(subject.include_spec_for?(files.first)).to eq(files.first)
     end
 
-    it "returns the spec when the file name looks like it could be a match" do
-      expect(subject.include_spec_for?('fixture_spec')).to match(/fixture_spec\.coffee$/)
+    it "returns a list of specs when the file name looks like it could be a match" do
+      expect( subject.include_spec_for?('fixture_spec').any? { |file| file.include?('fixture_spec.coffee') }).to be_true
     end
 
     it "returns false if a matching spec isn't found" do