Update to rails 3.2.10. Use simplercov in spinach too

Dmitriy Zaporozhets
1 parent 2f5a7333
Showing 4 changed files with 36 additions and 31 deletions Show diff stats
Gemfile
Gemfile.lock
app/assets/stylesheets/sections/notes.scss
features/support/env.rb
@@ -8,7 +8,7 @@ def linux_only(require_as)
   RUBY_PLATFORM.include?('linux') && require_as
 end
  
-gem "rails", "3.2.9"
+gem "rails", "3.2.10"
  
 # Supported DBs
 gem "mysql2", group: :mysql
@@ -74,12 +74,12 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.9)
-      actionpack (= 3.2.9)
+    actionmailer (3.2.10)
+      actionpack (= 3.2.10)
       mail (~> 2.4.4)
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    actionpack (3.2.10)
+      activemodel (= 3.2.10)
+      activesupport (= 3.2.10)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -87,18 +87,18 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    activemodel (3.2.10)
+      activesupport (= 3.2.10)
       builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    activerecord (3.2.10)
+      activemodel (= 3.2.10)
+      activesupport (= 3.2.10)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-    activesupport (3.2.9)
+    activeresource (3.2.10)
+      activemodel (= 3.2.10)
+      activesupport (= 3.2.10)
+    activesupport (3.2.10)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     acts-as-taggable-on (2.3.3)
@@ -245,7 +245,7 @@ GEM
     jquery-ui-rails (2.0.2)
       jquery-rails
       railties (>= 3.1.0)
-    json (1.7.5)
+    json (1.7.6)
     jwt (0.1.5)
       multi_json (>= 1.0)
     kaminari (0.14.1)
@@ -269,7 +269,7 @@ GEM
     mime-types (1.19)
     modernizr (2.6.2)
       sprockets (~> 2.0)
-    multi_json (1.3.7)
+    multi_json (1.5.0)
     multi_xml (0.5.1)
     multipart-post (1.1.5)
     mysql2 (0.3.11)
@@ -327,14 +327,14 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.9)
-      actionmailer (= 3.2.9)
-      actionpack (= 3.2.9)
-      activerecord (= 3.2.9)
-      activeresource (= 3.2.9)
-      activesupport (= 3.2.9)
+    rails (3.2.10)
+      actionmailer (= 3.2.10)
+      actionpack (= 3.2.10)
+      activerecord (= 3.2.10)
+      activeresource (= 3.2.10)
+      activesupport (= 3.2.10)
       bundler (~> 1.0)
-      railties (= 3.2.9)
+      railties (= 3.2.10)
     rails-dev-tweaks (0.6.1)
       actionpack (~> 3.1)
       railties (~> 3.1)
@@ -346,15 +346,15 @@ GEM
       erubis
       i18n
       progressbar
-    railties (3.2.9)
-      actionpack (= 3.2.9)
-      activesupport (= 3.2.9)
+    railties (3.2.10)
+      actionpack (= 3.2.10)
+      activesupport (= 3.2.10)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     raindrops (0.10.0)
-    rake (10.0.1)
+    rake (10.0.3)
     raphael-rails (1.5.2)
     rb-fsevent (0.9.2)
     rb-inotify (0.8.8)
@@ -424,7 +424,7 @@ GEM
       capybara (~> 1)
       railties (>= 3)
       spinach (>= 0.4)
-    sprockets (2.2.1)
+    sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -522,7 +522,7 @@ DEPENDENCIES
   pygments.rb!
   quiet_assets (~> 1.0.1)
   rack-mini-profiler
-  rails (= 3.2.9)
+  rails (= 3.2.10)
   rails-dev-tweaks
   rails_best_practices
   raphael-rails (= 1.5.2)
@@ -228,6 +228,6 @@ td .line_note_link {
 }
  
 .note-text {
-  border: 1px solid #aaa;
+  border: 1px solid #DDD;
   box-shadow: none;
 }
+unless ENV['CI']
+  require 'simplecov'
+  SimpleCov.start 'rails'
+end
+
 ENV['RAILS_ENV'] = 'test'
 require './config/environment'
...	...	@@ -8,7 +8,7 @@ def linux_only(require_as)
8	8	RUBY_PLATFORM.include?('linux') && require_as
9	9	end
10	10
11		-gem "rails", "3.2.9"
	11	+gem "rails", "3.2.10"
12	12
13	13	# Supported DBs
14	14	gem "mysql2", group: :mysql
...	...
...	...	@@ -74,12 +74,12 @@ GIT
74	74	GEM
75	75	remote: http://rubygems.org/
76	76	specs:
77		- actionmailer (3.2.9)
78		- actionpack (= 3.2.9)
	77	+ actionmailer (3.2.10)
	78	+ actionpack (= 3.2.10)
79	79	mail (~> 2.4.4)
80		- actionpack (3.2.9)
81		- activemodel (= 3.2.9)
82		- activesupport (= 3.2.9)
	80	+ actionpack (3.2.10)
	81	+ activemodel (= 3.2.10)
	82	+ activesupport (= 3.2.10)
83	83	builder (~> 3.0.0)
84	84	erubis (~> 2.7.0)
85	85	journey (~> 1.0.4)
...	...	@@ -87,18 +87,18 @@ GEM
87	87	rack-cache (~> 1.2)
88	88	rack-test (~> 0.6.1)
89	89	sprockets (~> 2.2.1)
90		- activemodel (3.2.9)
91		- activesupport (= 3.2.9)
	90	+ activemodel (3.2.10)
	91	+ activesupport (= 3.2.10)
92	92	builder (~> 3.0.0)
93		- activerecord (3.2.9)
94		- activemodel (= 3.2.9)
95		- activesupport (= 3.2.9)
	93	+ activerecord (3.2.10)
	94	+ activemodel (= 3.2.10)
	95	+ activesupport (= 3.2.10)
96	96	arel (~> 3.0.2)
97	97	tzinfo (~> 0.3.29)
98		- activeresource (3.2.9)
99		- activemodel (= 3.2.9)
100		- activesupport (= 3.2.9)
101		- activesupport (3.2.9)
	98	+ activeresource (3.2.10)
	99	+ activemodel (= 3.2.10)
	100	+ activesupport (= 3.2.10)
	101	+ activesupport (3.2.10)
102	102	i18n (~> 0.6)
103	103	multi_json (~> 1.0)
104	104	acts-as-taggable-on (2.3.3)
...	...	@@ -245,7 +245,7 @@ GEM
245	245	jquery-ui-rails (2.0.2)
246	246	jquery-rails
247	247	railties (>= 3.1.0)
248		- json (1.7.5)
	248	+ json (1.7.6)
249	249	jwt (0.1.5)
250	250	multi_json (>= 1.0)
251	251	kaminari (0.14.1)
...	...	@@ -269,7 +269,7 @@ GEM
269	269	mime-types (1.19)
270	270	modernizr (2.6.2)
271	271	sprockets (~> 2.0)
272		- multi_json (1.3.7)
	272	+ multi_json (1.5.0)
273	273	multi_xml (0.5.1)
274	274	multipart-post (1.1.5)
275	275	mysql2 (0.3.11)
...	...	@@ -327,14 +327,14 @@ GEM
327	327	rack
328	328	rack-test (0.6.2)
329	329	rack (>= 1.0)
330		- rails (3.2.9)
331		- actionmailer (= 3.2.9)
332		- actionpack (= 3.2.9)
333		- activerecord (= 3.2.9)
334		- activeresource (= 3.2.9)
335		- activesupport (= 3.2.9)
	330	+ rails (3.2.10)
	331	+ actionmailer (= 3.2.10)
	332	+ actionpack (= 3.2.10)
	333	+ activerecord (= 3.2.10)
	334	+ activeresource (= 3.2.10)
	335	+ activesupport (= 3.2.10)
336	336	bundler (~> 1.0)
337		- railties (= 3.2.9)
	337	+ railties (= 3.2.10)
338	338	rails-dev-tweaks (0.6.1)
339	339	actionpack (~> 3.1)
340	340	railties (~> 3.1)
...	...	@@ -346,15 +346,15 @@ GEM
346	346	erubis
347	347	i18n
348	348	progressbar
349		- railties (3.2.9)
350		- actionpack (= 3.2.9)
351		- activesupport (= 3.2.9)
	349	+ railties (3.2.10)
	350	+ actionpack (= 3.2.10)
	351	+ activesupport (= 3.2.10)
352	352	rack-ssl (~> 1.3.2)
353	353	rake (>= 0.8.7)
354	354	rdoc (~> 3.4)
355	355	thor (>= 0.14.6, < 2.0)
356	356	raindrops (0.10.0)
357		- rake (10.0.1)
	357	+ rake (10.0.3)
358	358	raphael-rails (1.5.2)
359	359	rb-fsevent (0.9.2)
360	360	rb-inotify (0.8.8)
...	...	@@ -424,7 +424,7 @@ GEM
424	424	capybara (~> 1)
425	425	railties (>= 3)
426	426	spinach (>= 0.4)
427		- sprockets (2.2.1)
	427	+ sprockets (2.2.2)
428	428	hike (~> 1.2)
429	429	multi_json (~> 1.0)
430	430	rack (~> 1.0)
...	...	@@ -522,7 +522,7 @@ DEPENDENCIES
522	522	pygments.rb!
523	523	quiet_assets (~> 1.0.1)
524	524	rack-mini-profiler
525		- rails (= 3.2.9)
	525	+ rails (= 3.2.10)
526	526	rails-dev-tweaks
527	527	rails_best_practices
528	528	raphael-rails (= 1.5.2)
...	...
...	...	@@ -228,6 +228,6 @@ td .line_note_link {
228	228	}
229	229
230	230	.note-text {
231		- border: 1px solid #aaa;
	231	+ border: 1px solid #DDD;
232	232	box-shadow: none;
233	233	}
...	...
	1	+unless ENV['CI']
	2	+ require 'simplecov'
	3	+ SimpleCov.start 'rails'
	4	+end
	5	+
1	6	ENV['RAILS_ENV'] = 'test'
2	7	require './config/environment'
3	8
...	...