Compare commits

..

3 Commits

Author SHA1 Message Date
John Bintz
f7384d684c It's been fun. Use Karma instead. 2014-05-14 15:34:21 -04:00
John Bintz
1055dc1016 Merge pull request #177 from jeremy-brenner/master
Qt 4.8 fix
2013-03-15 10:59:23 -07:00
Jeremy Brenner
c1e786f3c5 Added compiler directive to include getopt.h on qt versions >= 4.8 2013-03-15 11:23:50 -05:00
3 changed files with 5 additions and 18 deletions

View File

@ -1,4 +1,4 @@
_I am looking for a new maintainer for this project. Please contact me via GitHub if you're interested._ _This project is dead. You should use [Karma](http://karma-runner.github.io/) instead. I do._
# Jasmine Headless WebKit runner # Jasmine Headless WebKit runner

View File

@ -23,6 +23,10 @@
#include "Runner.h" #include "Runner.h"
#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0)
#include <getopt.h>
#endif
#if QT_VERSION < QT_VERSION_CHECK(4, 7, 0) #if QT_VERSION < QT_VERSION_CHECK(4, 7, 0)
#error Use Qt 4.7 or later version #error Use Qt 4.7 or later version
#endif #endif

View File

@ -1,7 +1,6 @@
require 'jasmine-core' require 'jasmine-core'
require 'time' require 'time'
require 'multi_json' require 'multi_json'
require 'rubygems'
require 'set' require 'set'
require 'sprockets' require 'sprockets'
require 'sprockets/engines' require 'sprockets/engines'
@ -131,14 +130,8 @@ module Jasmine::Headless
@search_paths += src_dir.collect { |dir| File.expand_path(dir) } @search_paths += src_dir.collect { |dir| File.expand_path(dir) }
@search_paths += asset_paths.collect { |dir| File.expand_path(dir) } @search_paths += asset_paths.collect { |dir| File.expand_path(dir) }
@search_paths += spec_dir.collect { |dir| File.expand_path(dir) } @search_paths += spec_dir.collect { |dir| File.expand_path(dir) }
@search_paths += gem_assets.collect do |name, dirs|
dirs.collect do |dir|
File.expand_path(File.join(gem_dir(name), dir))
end
end.flatten
@search_paths.uniq! @search_paths.uniq!
@search_paths @search_paths
end end
@ -298,10 +291,6 @@ module Jasmine::Headless
@asset_paths ||= config_dir('asset_paths') @asset_paths ||= config_dir('asset_paths')
end end
def gem_assets
@gem_assets ||= @options[:config]['gem_assets']
end
def spec_file_searches def spec_file_searches
@searches['spec_files'] @searches['spec_files']
end end
@ -331,12 +320,6 @@ module Jasmine::Headless
def spec_helper def spec_helper
File.join(spec_dir, "helpers", "spec_helper") File.join(spec_dir, "helpers", "spec_helper")
end end
def gem_dir gem
return unless gemspec = Gem.loaded_specs[gem]
gemspec.gem_dir
end
end end
end end