jasmine-headless-webkit 0.0.1 → 0.0.2

data/.autotest

@@ -0,0 +1,9 @@
+Autotest.add_hook(:initialize) do |at|
+  at.add_mapping(%r{bin/.*}, true) do |filename|
+    at.files_matching(%r{spec/bin/.*})
+  end
+
+  at.add_mapping(%r{spec/jasmine/.*}, true) do |filename|
+    at.files_matching(%r{spec/bin/.*})
+  end
+end

data/.gitignore

@@ -2,3 +2,7 @@
 .bundle
 Gemfile.lock
 pkg/*
+Makefile
+specrunner.moc
+specrunner.o
+ext/jasmine-webkit-specrunner/jasmine-webkit-specrunner

data/.rspec

@@ -0,0 +1 @@
+-c

data/Gemfile

@@ -2,3 +2,7 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in jasmine-headless-webkit.gemspec
 gemspec
+
+gem 'rspec'
+gem 'autotest'
+

data/README.md

@@ -2,20 +2,26 @@
 
 ## Introduction
 
-This gem works with projects that use the [Jasmine gem](https://github.com/pivotal/jasmine-gem) to 
-create a `jasmine.yml` file defining what to test. The runner loads that
+This gem works with projects that have used the [Jasmine gem](https://github.com/pivotal/jasmine-gem) to 
+create a `jasmine.yml` file that defines what to test. The runner loads that
 `jasmine.yml` file and executes the
-tests in a Qt WebKit widget, displaying the results to the console and setting the exit code to 0 for
-success or 1 for failure.
+tests in a Qt WebKit widget, displaying the results to the console and setting the exit code to one
+of the following:
+
+* 0 for success
+* 1 for spec run failure
+* 2 for spec run success, but `console.log` was called during the run
 
 `console.log` works, too, so you can run your specs side-by-side in a browser if you're so inclined.
 
+## Installation
+
+`gem install jasmine-headless-webkit` or use Bundler.
+
 ## Usage
 
     jasmine-headless-webkit [path to jasmine.yml, defaults to spec/javascripts/support/jasmine.yml]
 
-*This gem is currently as rough as it gets.*
-
 Installation requires Qt 4.7. See [senchalabs/examples](https://github.com/senchalabs/examples) and [my fork
 of examples](https://github.com/johnbintz/examples) for more information on the QtWebKit runner.
 

data/autotest/discover.rb

@@ -0,0 +1 @@
+Autotest.add_discovery { 'rspec2' }

data/bin/jasmine-headless-webkit

@@ -64,7 +64,7 @@ HTML
 
 File.open(target = "specrunner.#{$$}.html", 'w') { |fh| fh.print output }
 system %{#{File.join(gem_dir, 'ext/jasmine-webkit-specrunner/jasmine-webkit-specrunner')} #{target}}
-status = ($? == 0) ? 0 : 1
+status = $?.exitstatus
 FileUtils.rm_f target
 
 exit status

data/ext/jasmine-webkit-specrunner/specrunner.cpp

@@ -29,6 +29,20 @@
 #error Use Qt 4.7 or later version
 #endif
 
+class HeadlessSpecRunnerPage: public QWebPage
+{
+  Q_OBJECT
+signals:
+  void consoleLog(const QString &msg, int lineNumber, const QString &sourceID);
+protected:
+  void javaScriptConsoleMessage(const QString & message, int lineNumber, const QString & sourceID);
+};
+
+void HeadlessSpecRunnerPage::javaScriptConsoleMessage(const QString &message, int lineNumber, const QString &sourceID)
+{
+  emit consoleLog(message, lineNumber, sourceID);
+}
+
 class HeadlessSpecRunner: public QObject
 {
     Q_OBJECT
@@ -40,21 +54,27 @@ public slots:
     void specLog(int indent, const QString &msg, const QString &clazz);
 private slots:
     void watch(bool ok);
+    void errorLog(const QString &msg, int lineNumber, const QString &sourceID);
 protected:
     bool hasElement(const char *select);
     void timerEvent(QTimerEvent *event);
 private:
-    QWebPage m_page;
+    HeadlessSpecRunnerPage m_page;
     QBasicTimer m_ticker;
     int m_runs;
+    bool hasErrors;
+    bool usedConsole;
 };
 
 HeadlessSpecRunner::HeadlessSpecRunner()
     : QObject()
     , m_runs(0)
+    , hasErrors(false)
+    , usedConsole(false)
 {
     m_page.settings()->enablePersistentStorage();
     connect(&m_page, SIGNAL(loadFinished(bool)), this, SLOT(watch(bool)));
+    connect(&m_page, SIGNAL(consoleLog(QString, int, QString)), this, SLOT(errorLog(QString, int, QString)));
 }
 
 void HeadlessSpecRunner::load(const QString &spec)
@@ -81,8 +101,20 @@ bool HeadlessSpecRunner::hasElement(const char *select)
     return !m_page.mainFrame()->findFirstElement(select).isNull();
 }
 
+void HeadlessSpecRunner::errorLog(const QString &msg, int lineNumber, const QString &sourceID)
+{
+  std::cout << "\033[0;31m" << "[error] " << "\033[m;";
+  std::cout << qPrintable(sourceID) << ":" << lineNumber << " : " << qPrintable(msg);
+  std::cout << std::endl;
+
+  hasErrors = true;
+  m_runs = 0;
+  m_ticker.start(200, this);
+}
+
 void HeadlessSpecRunner::log(const QString &msg)
 {
+  usedConsole = true;
   std::cout << "\033[0;32m" << "[console] " << "\033[m";
   std::cout << qPrintable(msg);
   std::cout << std::endl;
@@ -116,32 +148,38 @@ void HeadlessSpecRunner::specLog(int indent, const QString &msg, const QString &
 
 void HeadlessSpecRunner::timerEvent(QTimerEvent *event)
 {
-    if (event->timerId() != m_ticker.timerId())
-        return;
+    ++m_runs;
 
-    if (!hasElement(".jasmine_reporter") && !hasElement(".runner.running"))
+    if (event->timerId() != m_ticker.timerId())
         return;
 
-    if (hasElement(".runner.passed")) {
-        QWebElement desc = m_page.mainFrame()->findFirstElement(".description");
-        std::cout << "\033[0;32m" << "PASS: " << qPrintable(desc.toPlainText()) << "\033[m" << std::endl;
-        QApplication::instance()->exit(0);
-        return;
-    }
-
-    if (hasElement(".runner.failed")) {
-        QWebElement desc = m_page.mainFrame()->findFirstElement(".description");
-        std::cout << "\033[0;31m" << "FAIL: " << qPrintable(desc.toPlainText()) << "\033[m" << std::endl;
-        m_page.mainFrame()->evaluateJavaScript(DUMP_MSG);
-//QDesktopServices::openUrl(m_page.mainFrame()->url());
+    if (hasErrors && m_runs > 2)
         QApplication::instance()->exit(1);
-        return;
-    }
 
-    ++m_runs;
-    if (m_runs > 20) {
-        std::cout << "WARNING: too many runs and the test is still not finished!" << std::endl;
-        QApplication::instance()->exit(1);
+    if (!hasErrors) {
+      if (!hasElement(".jasmine_reporter") && !hasElement(".runner.running"))
+          return;
+
+      if (hasElement(".runner.passed")) {
+          QWebElement desc = m_page.mainFrame()->findFirstElement(".description");
+          std::cout << "\033[0;32m" << "PASS: " << qPrintable(desc.toPlainText()) << "\033[m" << std::endl;
+          QApplication::instance()->exit(usedConsole ? 2 : 0);
+          return;
+      }
+
+      if (hasElement(".runner.failed")) {
+          QWebElement desc = m_page.mainFrame()->findFirstElement(".description");
+          std::cout << "\033[0;31m" << "FAIL: " << qPrintable(desc.toPlainText()) << "\033[m" << std::endl;
+          m_page.mainFrame()->evaluateJavaScript(DUMP_MSG);
+  //QDesktopServices::openUrl(m_page.mainFrame()->url());
+          QApplication::instance()->exit(1);
+          return;
+      }
+
+      if (m_runs > 30) {
+          std::cout << "WARNING: too many runs and the test is still not finished!" << std::endl;
+          QApplication::instance()->exit(1);
+      }
     }
 }
 

data/lib/jasmine-headless-webkit/version.rb

@@ -1,7 +1,7 @@
 module Jasmine
   module Headless
     module Webkit
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
   end
 end

data/spec/bin/jasmine-headless-webkit_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe "jasmine-headless-webkit" do
+  describe 'success' do
+    it "should succeed with error code 0" do
+      %x{bin/jasmine-headless-webkit spec/jasmine/success/success.yml}
+      $?.exitstatus.should == 0
+    end
+  end
+
+  describe 'failure' do
+    it "should fail with an error code of 1" do
+      %x{bin/jasmine-headless-webkit spec/jasmine/failure/failure.yml}
+      $?.exitstatus.should == 1
+    end
+  end
+
+  describe 'with console.log' do
+    it "should succeed, but has a console.log so an error code of 2" do
+      %x{bin/jasmine-headless-webkit spec/jasmine/console_log/console_log.yml}
+      $?.exitstatus.should == 2
+    end
+  end
+end
+

data/spec/jasmine/console_log/console_log.js

@@ -0,0 +1 @@
+var success = 1;

data/spec/jasmine/console_log/console_log.yml

@@ -0,0 +1,10 @@
+
+src_files:
+  - spec/jasmine/console_log/console_log.js
+
+spec_files:
+  - spec/jasmine/console_log/console_log_spec.js
+
+src_dir: .
+spec_dir: .
+

data/spec/jasmine/console_log/console_log_spec.js

@@ -0,0 +1,7 @@
+describe('console.log', function() {
+  it('should succeed, but with a console.log', function() {
+    console.log("hello");
+    expect(success).toEqual(1);
+  });
+});
+

data/spec/jasmine/failure/failure.js

@@ -0,0 +1 @@
+var failure = 0;

data/spec/jasmine/failure/failure.yml

@@ -0,0 +1,9 @@
+src_files:
+  - spec/jasmine/failure/failure.js
+
+spec_files:
+  - spec/jasmine/failure/failure_spec.js
+
+src_dir: .
+spec_dir: .
+

data/spec/jasmine/failure/failure_spec.js

@@ -0,0 +1,6 @@
+describe('failure', function() {
+  it("should fail with error code of 1", function() {
+    expect(failure).toEqual(1);
+  });
+});
+

data/spec/jasmine/success/success.js

@@ -0,0 +1 @@
+var success = 1;

data/spec/jasmine/success/success.yml

@@ -0,0 +1,9 @@
+src_files:
+  - spec/jasmine/success/success.js
+
+spec_files:
+  - spec/jasmine/success/success_spec.js
+
+src_dir: .
+spec_dir: .
+

data/spec/jasmine/success/success_spec.js

@@ -0,0 +1,6 @@
+describe('success', function() {
+  it("should be a success", function() {
+    expect(success).toEqual(1);
+  });
+});
+

data/spec/spec_helper.rb

@@ -0,0 +1,8 @@
+specrunner = 'ext/jasmine-webkit-specrunner/jasmine-webkit-specrunner'
+
+if !File.file?(specrunner)
+  Dir.chdir File.split(specrunner).first do
+    system %{ruby extconf.rb}
+  end
+end
+

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: jasmine-headless-webkit
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors: 
 - John Bintz
@@ -17,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 -04:00
+date: 2011-04-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,9 +23,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -44,11 +36,14 @@ extensions:
 extra_rdoc_files: []
 
 files: 
+- .autotest
 - .gitignore
 - .gitmodules
+- .rspec
 - Gemfile
 - README.md
 - Rakefile
+- autotest/discover.rb
 - bin/jasmine-headless-webkit
 - ext/jasmine-webkit-specrunner/Info.plist
 - ext/jasmine-webkit-specrunner/extconf.rb
@@ -57,6 +52,17 @@ files:
 - jasmine-headless-webkit.gemspec
 - lib/jasmine-headless-webkit.rb
 - lib/jasmine-headless-webkit/version.rb
+- spec/bin/jasmine-headless-webkit_spec.rb
+- spec/jasmine/console_log/console_log.js
+- spec/jasmine/console_log/console_log.yml
+- spec/jasmine/console_log/console_log_spec.js
+- spec/jasmine/failure/failure.js
+- spec/jasmine/failure/failure.yml
+- spec/jasmine/failure/failure_spec.js
+- spec/jasmine/success/success.js
+- spec/jasmine/success/success.yml
+- spec/jasmine/success/success_spec.js
+- spec/spec_helper.rb
 - jasmine/lib/jasmine-html.js
 - jasmine/lib/jasmine.css
 - jasmine/lib/jasmine.js
@@ -75,25 +81,29 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: jasmine-headless-webkit
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Run Jasmine specs headlessly in a WebKit browser
-test_files: []
-
+test_files: 
+- spec/bin/jasmine-headless-webkit_spec.rb
+- spec/jasmine/console_log/console_log.js
+- spec/jasmine/console_log/console_log.yml
+- spec/jasmine/console_log/console_log_spec.js
+- spec/jasmine/failure/failure.js
+- spec/jasmine/failure/failure.yml
+- spec/jasmine/failure/failure_spec.js
+- spec/jasmine/success/success.js
+- spec/jasmine/success/success.yml
+- spec/jasmine/success/success_spec.js
+- spec/spec_helper.rb