jasmine-headless-webkit 0.7.2 → 0.7.3.1
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/jasmine/headless/runner.rb +13 -2
- data/lib/jasmine/headless/version.rb +1 -1
- data/lib/qt/qmake.rb +1 -15
- data/spec/lib/jasmine/headless/runner_spec.rb +12 -0
- data/spec/lib/qt/qmake_spec.rb +1 -6
- metadata +10 -10
@@ -45,9 +45,13 @@ module Jasmine
|
|
45
45
|
end
|
46
46
|
|
47
47
|
def jasmine_config
|
48
|
-
|
48
|
+
return @jasmine_config if @jasmine_config
|
49
49
|
|
50
|
-
@jasmine_config
|
50
|
+
@jasmine_config = JASMINE_DEFAULTS.dup
|
51
|
+
jasmine_config_data.each do |key, value|
|
52
|
+
@jasmine_config[key] = value if value
|
53
|
+
end
|
54
|
+
@jasmine_config
|
51
55
|
end
|
52
56
|
|
53
57
|
def jasmine_command(*targets)
|
@@ -88,6 +92,13 @@ module Jasmine
|
|
88
92
|
end
|
89
93
|
end
|
90
94
|
end
|
95
|
+
|
96
|
+
private
|
97
|
+
def jasmine_config_data
|
98
|
+
raise JasmineConfigNotFound.new("Jasmine config not found. I tried #{@options[:jasmine_config]}.") if !File.file?(@options[:jasmine_config])
|
99
|
+
|
100
|
+
YAML.load_file(@options[:jasmine_config])
|
101
|
+
end
|
91
102
|
end
|
92
103
|
end
|
93
104
|
end
|
data/lib/qt/qmake.rb
CHANGED
@@ -2,12 +2,6 @@ require 'rbconfig'
|
|
2
2
|
require 'rubygems'
|
3
3
|
require 'rubygems/version'
|
4
4
|
|
5
|
-
begin
|
6
|
-
require 'facter'
|
7
|
-
rescue LoadError
|
8
|
-
warn 'Including Facter allows for detection of # of cpus, resulting in faster compilations.'
|
9
|
-
end
|
10
|
-
|
11
5
|
module Qt
|
12
6
|
class NotInstalledError < StandardError; end
|
13
7
|
class Qmake
|
@@ -49,7 +43,7 @@ module Qt
|
|
49
43
|
end
|
50
44
|
|
51
45
|
def make_options
|
52
|
-
"
|
46
|
+
""
|
53
47
|
end
|
54
48
|
|
55
49
|
#
|
@@ -103,14 +97,6 @@ module Qt
|
|
103
97
|
end.compact.join(" ")
|
104
98
|
end
|
105
99
|
|
106
|
-
def number_of_cpus
|
107
|
-
if defined?(Facter)
|
108
|
-
Facter.sp_number_processors rescue Facter.processorcount
|
109
|
-
else
|
110
|
-
1
|
111
|
-
end
|
112
|
-
end
|
113
|
-
|
114
100
|
def get_exe_path(command)
|
115
101
|
path = %x{which #{command}}.strip
|
116
102
|
path = nil if path == ''
|
@@ -155,4 +155,16 @@ describe Jasmine::Headless::Runner do
|
|
155
155
|
end
|
156
156
|
end
|
157
157
|
end
|
158
|
+
|
159
|
+
describe '#jasmine_config' do
|
160
|
+
let(:opts) { {} }
|
161
|
+
|
162
|
+
before do
|
163
|
+
runner.stubs(:jasmine_config_data).returns('spec_files' => nil)
|
164
|
+
end
|
165
|
+
|
166
|
+
it 'should not merge in things with nil values' do
|
167
|
+
runner.jasmine_config['spec_files'].should == described_class::JASMINE_DEFAULTS['spec_files']
|
168
|
+
end
|
169
|
+
end
|
158
170
|
end
|
data/spec/lib/qt/qmake_spec.rb
CHANGED
@@ -140,14 +140,9 @@ describe Qt::Qmake do
|
|
140
140
|
end
|
141
141
|
|
142
142
|
describe '.make_options' do
|
143
|
-
let(:cpu_count) { 3 }
|
144
143
|
subject { Qt::Qmake.make_options }
|
145
144
|
|
146
|
-
|
147
|
-
Qt::Qmake.stubs(:number_of_cpus).returns(cpu_count)
|
148
|
-
end
|
149
|
-
|
150
|
-
it { should == "-j#{cpu_count}" }
|
145
|
+
it { should == "" }
|
151
146
|
end
|
152
147
|
end
|
153
148
|
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: jasmine-headless-webkit
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.7.
|
4
|
+
version: 0.7.3.1
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -11,11 +11,11 @@ authors:
|
|
11
11
|
autorequire:
|
12
12
|
bindir: bin
|
13
13
|
cert_chain: []
|
14
|
-
date: 2011-
|
14
|
+
date: 2011-11-06 00:00:00.000000000Z
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|
17
17
|
name: jasmine-core
|
18
|
-
requirement: &
|
18
|
+
requirement: &2155137140 !ruby/object:Gem::Requirement
|
19
19
|
none: false
|
20
20
|
requirements:
|
21
21
|
- - ~>
|
@@ -23,10 +23,10 @@ dependencies:
|
|
23
23
|
version: 1.1.beta
|
24
24
|
type: :runtime
|
25
25
|
prerelease: false
|
26
|
-
version_requirements: *
|
26
|
+
version_requirements: *2155137140
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: coffee-script
|
29
|
-
requirement: &
|
29
|
+
requirement: &2155136360 !ruby/object:Gem::Requirement
|
30
30
|
none: false
|
31
31
|
requirements:
|
32
32
|
- - ! '>='
|
@@ -34,10 +34,10 @@ dependencies:
|
|
34
34
|
version: '2.2'
|
35
35
|
type: :runtime
|
36
36
|
prerelease: false
|
37
|
-
version_requirements: *
|
37
|
+
version_requirements: *2155136360
|
38
38
|
- !ruby/object:Gem::Dependency
|
39
39
|
name: rainbow
|
40
|
-
requirement: &
|
40
|
+
requirement: &2155135840 !ruby/object:Gem::Requirement
|
41
41
|
none: false
|
42
42
|
requirements:
|
43
43
|
- - ! '>='
|
@@ -45,10 +45,10 @@ dependencies:
|
|
45
45
|
version: '0'
|
46
46
|
type: :runtime
|
47
47
|
prerelease: false
|
48
|
-
version_requirements: *
|
48
|
+
version_requirements: *2155135840
|
49
49
|
- !ruby/object:Gem::Dependency
|
50
50
|
name: multi_json
|
51
|
-
requirement: &
|
51
|
+
requirement: &2155135380 !ruby/object:Gem::Requirement
|
52
52
|
none: false
|
53
53
|
requirements:
|
54
54
|
- - ! '>='
|
@@ -56,7 +56,7 @@ dependencies:
|
|
56
56
|
version: '0'
|
57
57
|
type: :runtime
|
58
58
|
prerelease: false
|
59
|
-
version_requirements: *
|
59
|
+
version_requirements: *2155135380
|
60
60
|
description: Run Jasmine specs headlessly
|
61
61
|
email:
|
62
62
|
- john@coswellproductions.com
|