Skip to content

Commit b1f138b

Browse files
committed
Update jasmine gem to fix Travis build.
1 parent dfa2917 commit b1f138b

File tree

2 files changed

+126
-122
lines changed

2 files changed

+126
-122
lines changed

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ gemspec
55
gem "rspec-rails", ">=2.12.0"
66
gem "therubyrhino"
77
gem "therubyracer"
8-
gem "jasmine", ">=1.2.0"
8+
gem "jasmine"
99
gem "headless"
1010
gem "coffee-script"
1111
gem "thin"

Gemfile.lock

+125-121
Original file line numberDiff line numberDiff line change
@@ -13,187 +13,191 @@ PATH
1313
GEM
1414
remote: http://rubygems.org/
1515
specs:
16-
actionmailer (3.2.9)
17-
actionpack (= 3.2.9)
18-
mail (~> 2.4.4)
19-
actionpack (3.2.9)
20-
activemodel (= 3.2.9)
21-
activesupport (= 3.2.9)
22-
builder (~> 3.0.0)
16+
actionmailer (4.0.0)
17+
actionpack (= 4.0.0)
18+
mail (~> 2.5.3)
19+
actionpack (4.0.0)
20+
activesupport (= 4.0.0)
21+
builder (~> 3.1.0)
2322
erubis (~> 2.7.0)
24-
journey (~> 1.0.4)
25-
rack (~> 1.4.0)
26-
rack-cache (~> 1.2)
27-
rack-test (~> 0.6.1)
28-
sprockets (~> 2.2.1)
29-
activemodel (3.2.9)
30-
activesupport (= 3.2.9)
31-
builder (~> 3.0.0)
32-
activerecord (3.2.9)
33-
activemodel (= 3.2.9)
34-
activesupport (= 3.2.9)
35-
arel (~> 3.0.2)
36-
tzinfo (~> 0.3.29)
37-
activerecord-jdbc-adapter (1.2.2.1)
38-
activerecord-jdbcsqlite3-adapter (1.2.2.1)
39-
activerecord-jdbc-adapter (~> 1.2.2.1)
23+
rack (~> 1.5.2)
24+
rack-test (~> 0.6.2)
25+
activemodel (4.0.0)
26+
activesupport (= 4.0.0)
27+
builder (~> 3.1.0)
28+
activerecord (4.0.0)
29+
activemodel (= 4.0.0)
30+
activerecord-deprecated_finders (~> 1.0.2)
31+
activesupport (= 4.0.0)
32+
arel (~> 4.0.0)
33+
activerecord-deprecated_finders (1.0.3)
34+
activerecord-jdbc-adapter (1.2.9)
35+
activerecord-jdbcsqlite3-adapter (1.2.9)
36+
activerecord-jdbc-adapter (~> 1.2.9)
4037
jdbc-sqlite3 (~> 3.7.2)
41-
activeresource (3.2.9)
42-
activemodel (= 3.2.9)
43-
activesupport (= 3.2.9)
44-
activesupport (3.2.9)
45-
i18n (~> 0.6)
46-
multi_json (~> 1.0)
47-
arel (3.0.2)
48-
builder (3.0.4)
49-
childprocess (0.3.6)
50-
ffi (~> 1.0, >= 1.0.6)
51-
coderay (1.0.8)
38+
activesupport (4.0.0)
39+
i18n (~> 0.6, >= 0.6.4)
40+
minitest (~> 4.2)
41+
multi_json (~> 1.3)
42+
thread_safe (~> 0.1)
43+
tzinfo (~> 0.3.37)
44+
arel (4.0.0)
45+
atomic (1.1.10)
46+
atomic (1.1.10-java)
47+
builder (3.1.4)
48+
childprocess (0.3.9)
49+
ffi (~> 1.0, >= 1.0.11)
50+
coderay (1.0.9)
5251
coffee-script (2.2.0)
5352
coffee-script-source
5453
execjs
55-
coffee-script-source (1.4.0)
54+
coffee-script-source (1.6.3)
5655
daemons (1.1.9)
57-
diff-lcs (1.1.3)
56+
diff-lcs (1.2.4)
5857
em-synchrony (1.0.3)
5958
eventmachine (>= 1.0.0.beta.1)
6059
erubis (2.7.0)
61-
eventmachine (1.0.0)
62-
eventmachine (1.0.0-java)
60+
eventmachine (1.0.3)
61+
eventmachine (1.0.3-java)
6362
execjs (1.4.0)
6463
multi_json (~> 1.0)
65-
faye-websocket (0.4.6)
66-
eventmachine (>= 0.12.0)
67-
faye-websocket (0.4.6-java)
64+
faye-websocket (0.6.2)
6865
eventmachine (>= 0.12.0)
69-
ffi (1.2.0)
70-
ffi (1.2.0-java)
71-
guard (1.5.4)
72-
listen (>= 0.4.2)
66+
websocket-driver (>= 0.2.0)
67+
ffi (1.9.0)
68+
ffi (1.9.0-java)
69+
formatador (0.2.4)
70+
guard (1.8.1)
71+
formatador (>= 0.2.4)
72+
listen (>= 1.0.0)
7373
lumberjack (>= 1.0.2)
7474
pry (>= 0.9.10)
7575
thor (>= 0.14.6)
76-
guard-coffeescript (1.2.1)
76+
guard-coffeescript (1.3.2)
7777
coffee-script (>= 2.2.0)
7878
guard (>= 1.1.0)
79-
guard-rspec (2.1.2)
80-
guard (>= 1.1)
81-
rspec (~> 2.11)
82-
headless (0.3.1)
83-
hike (1.2.1)
79+
guard-rspec (3.0.2)
80+
guard (>= 1.8)
81+
rspec (~> 2.13)
82+
headless (1.0.1)
83+
hike (1.2.3)
8484
hiredis (0.4.5)
8585
hiredis (0.4.5-java)
86-
i18n (0.6.1)
87-
jasmine (1.2.1)
88-
jasmine-core (>= 1.2.0)
86+
i18n (0.6.4)
87+
jasmine (1.3.2)
88+
jasmine-core (~> 1.3.1)
8989
rack (~> 1.0)
9090
rspec (>= 1.3.1)
9191
selenium-webdriver (>= 0.1.3)
92-
jasmine-core (1.2.0)
93-
jdbc-sqlite3 (3.7.2)
94-
journey (1.0.4)
95-
json (1.7.5)
96-
json (1.7.5-java)
97-
libv8 (3.3.10.4)
98-
libwebsocket (0.1.6.1)
99-
websocket
100-
listen (0.6.0)
101-
lumberjack (1.0.2)
102-
mail (2.4.4)
103-
i18n (>= 0.4.0)
92+
jasmine-core (1.3.1)
93+
jdbc-sqlite3 (3.7.2.1)
94+
libv8 (3.11.8.17)
95+
listen (1.2.2)
96+
rb-fsevent (>= 0.9.3)
97+
rb-inotify (>= 0.9)
98+
rb-kqueue (>= 0.2)
99+
lumberjack (1.0.4)
100+
mail (2.5.4)
104101
mime-types (~> 1.16)
105102
treetop (~> 1.4.8)
106103
method_source (0.8.1)
107104
mime-types (1.23)
108-
multi_json (1.3.7)
105+
minitest (4.7.5)
106+
multi_json (1.7.7)
109107
polyglot (0.3.3)
110-
pry (0.9.10)
108+
pry (0.9.12.2)
111109
coderay (~> 1.0.5)
112110
method_source (~> 0.8)
113-
slop (~> 3.3.1)
114-
pry (0.9.10-java)
111+
slop (~> 3.4)
112+
pry (0.9.12.2-java)
115113
coderay (~> 1.0.5)
116114
method_source (~> 0.8)
117-
slop (~> 3.3.1)
115+
slop (~> 3.4)
118116
spoon (~> 0.0)
119-
rack (1.4.1)
120-
rack-cache (1.2)
121-
rack (>= 0.4)
122-
rack-ssl (1.3.2)
123-
rack
117+
rack (1.5.2)
124118
rack-test (0.6.2)
125119
rack (>= 1.0)
126-
rails (3.2.9)
127-
actionmailer (= 3.2.9)
128-
actionpack (= 3.2.9)
129-
activerecord (= 3.2.9)
130-
activeresource (= 3.2.9)
131-
activesupport (= 3.2.9)
132-
bundler (~> 1.0)
133-
railties (= 3.2.9)
134-
railties (3.2.9)
135-
actionpack (= 3.2.9)
136-
activesupport (= 3.2.9)
137-
rack-ssl (~> 1.3.2)
120+
rails (4.0.0)
121+
actionmailer (= 4.0.0)
122+
actionpack (= 4.0.0)
123+
activerecord (= 4.0.0)
124+
activesupport (= 4.0.0)
125+
bundler (>= 1.3.0, < 2.0)
126+
railties (= 4.0.0)
127+
sprockets-rails (~> 2.0.0)
128+
railties (4.0.0)
129+
actionpack (= 4.0.0)
130+
activesupport (= 4.0.0)
138131
rake (>= 0.8.7)
139-
rdoc (~> 3.4)
140-
thor (>= 0.14.6, < 2.0)
141-
rake (10.0.2)
142-
rb-fsevent (0.9.2)
143-
rdoc (3.12)
144-
json (~> 1.4)
132+
thor (>= 0.18.1, < 2.0)
133+
rake (10.1.0)
134+
rb-fsevent (0.9.3)
135+
rb-inotify (0.9.0)
136+
ffi (>= 0.5.0)
137+
rb-kqueue (0.2.0)
138+
ffi (>= 0.5.0)
145139
redis (3.0.4)
146-
rspec (2.12.0)
147-
rspec-core (~> 2.12.0)
148-
rspec-expectations (~> 2.12.0)
149-
rspec-mocks (~> 2.12.0)
150-
rspec-core (2.12.0)
151-
rspec-expectations (2.12.0)
152-
diff-lcs (~> 1.1.3)
140+
ref (1.0.5)
141+
rspec (2.13.0)
142+
rspec-core (~> 2.13.0)
143+
rspec-expectations (~> 2.13.0)
144+
rspec-mocks (~> 2.13.0)
145+
rspec-core (2.13.1)
146+
rspec-expectations (2.13.0)
147+
diff-lcs (>= 1.1.3, < 2.0)
153148
rspec-matchers-matchers (1.0.0)
154-
rspec-mocks (2.12.0)
155-
rspec-rails (2.12.0)
149+
rspec-mocks (2.13.1)
150+
rspec-rails (2.13.2)
156151
actionpack (>= 3.0)
157152
activesupport (>= 3.0)
158153
railties (>= 3.0)
159-
rspec-core (~> 2.12.0)
160-
rspec-expectations (~> 2.12.0)
161-
rspec-mocks (~> 2.12.0)
154+
rspec-core (~> 2.13.0)
155+
rspec-expectations (~> 2.13.0)
156+
rspec-mocks (~> 2.13.0)
162157
ruby_gntp (0.3.4)
163158
rubyzip (0.9.9)
164-
selenium-webdriver (2.26.0)
159+
selenium-webdriver (2.33.0)
165160
childprocess (>= 0.2.5)
166-
libwebsocket (~> 0.1.3)
167161
multi_json (~> 1.0)
168162
rubyzip
163+
websocket (~> 1.0.4)
169164
simplecov (0.7.1)
170165
multi_json (~> 1.0)
171166
simplecov-html (~> 0.7.1)
172167
simplecov-html (0.7.1)
173-
slop (3.3.3)
174-
spoon (0.0.1)
175-
sprockets (2.2.1)
168+
slop (3.4.5)
169+
spoon (0.0.4)
170+
ffi
171+
sprockets (2.10.0)
176172
hike (~> 1.2)
177173
multi_json (~> 1.0)
178174
rack (~> 1.0)
179175
tilt (~> 1.1, != 1.3.0)
180-
sqlite3 (1.3.6)
181-
therubyracer (0.10.2)
182-
libv8 (~> 3.3.10)
183-
therubyrhino (2.0.1)
176+
sprockets-rails (2.0.0)
177+
actionpack (>= 3.0)
178+
activesupport (>= 3.0)
179+
sprockets (~> 2.8)
180+
sqlite3 (1.3.7)
181+
therubyracer (0.11.4)
182+
libv8 (~> 3.11.8.12)
183+
ref
184+
therubyrhino (2.0.2)
184185
therubyrhino_jar (>= 1.7.3)
185186
therubyrhino_jar (1.7.4)
186-
thin (1.5.0)
187+
thin (1.5.1)
187188
daemons (>= 1.0.9)
188189
eventmachine (>= 0.12.6)
189190
rack (>= 1.0.0)
190-
thor (0.16.0)
191-
tilt (1.3.3)
192-
treetop (1.4.12)
191+
thor (0.18.1)
192+
thread_safe (0.1.0)
193+
atomic
194+
tilt (1.4.1)
195+
treetop (1.4.14)
193196
polyglot
194197
polyglot (>= 0.3.1)
195198
tzinfo (0.3.37)
196-
websocket (1.0.4)
199+
websocket (1.0.7)
200+
websocket-driver (0.2.1)
197201

198202
PLATFORMS
199203
java
@@ -208,7 +212,7 @@ DEPENDENCIES
208212
guard-coffeescript
209213
guard-rspec
210214
headless
211-
jasmine (>= 1.2.0)
215+
jasmine
212216
rake
213217
rb-fsevent
214218
rspec-matchers-matchers

0 commit comments

Comments
 (0)