Download as
Browse Code »

Commit 99acd32fe1dfbb75b997b945488e3b469569ff17

Authored by Diego Camarinha
1 parent 8473667e
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Updated konacha and sprockets. 

This fixes issue #123 of konacha. The issue regarded the same error
travis is getting when running konacha tests.

Signed off by: Heitor Reis <marcheing@gmail.com>
Showing 2 changed files with 11 additions and 14 deletions   Show diff stats
@@ -103,7 +103,7 @@ group :development, :test do @@ -103,7 +103,7 @@ group :development, :test do
103 gem 'capistrano-rvm', "~>0.1.0" 103 gem 'capistrano-rvm', "~>0.1.0"
104 104
105 # JavaScript unit tests 105 # JavaScript unit tests
106 - gem "konacha", "~> 3.3.0" 106 + gem "konacha"
107 107
108 # Better error interface 108 # Better error interface
109 gem 'better_errors' 109 gem 'better_errors'
@@ -112,7 +112,7 @@ group :development, :test do @@ -112,7 +112,7 @@ group :development, :test do
112 # Localization assistance 112 # Localization assistance
113 gem 'i18n_generators' 113 gem 'i18n_generators'
114 114
115 - gem 'sprockets', '~>2.12.3' # spckets 3.0.3 breaks konacha 115 + gem 'sprockets'
116 116
117 # Mocks and stubs for javascript tests 117 # Mocks and stubs for javascript tests
118 gem 'sinon-rails' 118 gem 'sinon-rails'
@@ -139,7 +139,6 @@ GEM @@ -139,7 +139,6 @@ GEM
139 globalid (0.3.5) 139 globalid (0.3.5)
140 activesupport (>= 4.1.0) 140 activesupport (>= 4.1.0)
141 google-analytics-rails (0.0.6) 141 google-analytics-rails (0.0.6)
142 - hike (1.2.3)  
143 http-cookie (1.0.2) 142 http-cookie (1.0.2)
144 domain_name (~> 0.5) 143 domain_name (~> 0.5)
145 http_accept_language (2.0.5) 144 http_accept_language (2.0.5)
@@ -160,12 +159,13 @@ GEM @@ -160,12 +159,13 @@ GEM
160 kalibro_client (0.3.0) 159 kalibro_client (0.3.0)
161 activesupport (>= 2.2.1) 160 activesupport (>= 2.2.1)
162 faraday_middleware (~> 0.9.0) 161 faraday_middleware (~> 0.9.0)
163 - konacha (3.3.0) 162 + konacha (3.5.1)
164 actionpack (>= 3.1, < 5) 163 actionpack (>= 3.1, < 5)
165 capybara 164 capybara
166 colorize 165 colorize
167 railties (>= 3.1, < 5) 166 railties (>= 3.1, < 5)
168 - sprockets 167 + sprockets (>= 2, < 4)
  168 + tilt
169 less (2.6.0) 169 less (2.6.0)
170 commonjs (~> 0.2.7) 170 commonjs (~> 0.2.7)
171 less-rails (2.7.0) 171 less-rails (2.7.0)
@@ -188,12 +188,12 @@ GEM @@ -188,12 +188,12 @@ GEM
188 ntlm-http (~> 0.1, >= 0.1.1) 188 ntlm-http (~> 0.1, >= 0.1.1)
189 webrobots (>= 0.0.9, < 0.2) 189 webrobots (>= 0.0.9, < 0.2)
190 metaclass (0.0.4) 190 metaclass (0.0.4)
191 - mime-types (2.5) 191 + mime-types (2.6.1)
192 mini_portile (0.6.2) 192 mini_portile (0.6.2)
193 minitest (5.7.0) 193 minitest (5.7.0)
194 mocha (1.1.0) 194 mocha (1.1.0)
195 metaclass (~> 0.0.1) 195 metaclass (~> 0.0.1)
196 - multi_json (1.11.0) 196 + multi_json (1.11.1)
197 multi_test (0.1.2) 197 multi_test (0.1.2)
198 multipart-post (2.0.0) 198 multipart-post (2.0.0)
199 net-http-digest_auth (1.4) 199 net-http-digest_auth (1.4)
@@ -211,7 +211,7 @@ GEM @@ -211,7 +211,7 @@ GEM
211 cliver (~> 0.3.1) 211 cliver (~> 0.3.1)
212 multi_json (~> 1.0) 212 multi_json (~> 1.0)
213 websocket-driver (>= 0.2.0) 213 websocket-driver (>= 0.2.0)
214 - rack (1.6.1) 214 + rack (1.6.4)
215 rack-test (0.6.3) 215 rack-test (0.6.3)
216 rack (>= 1.0) 216 rack (>= 1.0)
217 rails (4.2.1) 217 rails (4.2.1)
@@ -280,11 +280,8 @@ GEM @@ -280,11 +280,8 @@ GEM
280 sinon-rails (1.15.0) 280 sinon-rails (1.15.0)
281 railties (>= 3.1) 281 railties (>= 3.1)
282 spring (1.3.6) 282 spring (1.3.6)
283 - sprockets (2.12.3)  
284 - hike (~> 1.2)  
285 - multi_json (~> 1.0) 283 + sprockets (3.2.0)
286 rack (~> 1.0) 284 rack (~> 1.0)
287 - tilt (~> 1.1, != 1.3.0)  
288 sprockets-rails (2.3.0) 285 sprockets-rails (2.3.0)
289 actionpack (>= 3.0) 286 actionpack (>= 3.0)
290 activesupport (>= 3.0) 287 activesupport (>= 3.0)
@@ -352,7 +349,7 @@ DEPENDENCIES @@ -352,7 +349,7 @@ DEPENDENCIES
352 jquery-rails 349 jquery-rails
353 jquery-ui-rails (~> 5.0.0) 350 jquery-ui-rails (~> 5.0.0)
354 kalibro_client (~> 0.3.0) 351 kalibro_client (~> 0.3.0)
355 - konacha (~> 3.3.0) 352 + konacha
356 mocha 353 mocha
357 pg (~> 0.18.1) 354 pg (~> 0.18.1)
358 poltergeist (~> 1.6.0) 355 poltergeist (~> 1.6.0)
@@ -365,7 +362,7 @@ DEPENDENCIES @@ -365,7 +362,7 @@ DEPENDENCIES
365 simplecov 362 simplecov
366 sinon-rails 363 sinon-rails
367 spring 364 spring
368 - sprockets (~> 2.12.3) 365 + sprockets
369 sqlite3 366 sqlite3
370 therubyracer 367 therubyracer
371 turbolinks 368 turbolinks