Skip to content

Commit 1e563a3

Browse files
committed
Merge pull request #221 from mikeastock/rails_4_2
Add Rails 4.2.0 to spec/integrations
2 parents a268860 + 2f4dea1 commit 1e563a3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+762
-0
lines changed
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
2+
#
3+
# If you find yourself ignoring temporary files generated by your text editor
4+
# or operating system, you probably want to add a global ignore instead:
5+
# git config --global core.excludesfile '~/.gitignore_global'
6+
7+
# Ignore bundler config.
8+
/.bundle
9+
10+
# Ignore the default SQLite database.
11+
/db/*.sqlite3
12+
/db/*.sqlite3-journal
13+
14+
# Ignore all logfiles and tempfiles.
15+
/log/*.log
16+
/tmp
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.9.3-p547

spec/integration/rails_4.2.0/Gemfile

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
source 'https://rubygems.org'
2+
3+
4+
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
5+
gem 'rails', '4.2.0'
6+
# Use sqlite3 as the database for Active Record
7+
gem 'sqlite3'
8+
# Use SCSS for stylesheets
9+
gem 'sass-rails', '~> 5.0'
10+
# Use Uglifier as compressor for JavaScript assets
11+
gem 'uglifier', '>= 1.3.0'
12+
# Use CoffeeScript for .js.coffee assets and views
13+
gem 'coffee-rails', '~> 4.1.0'
14+
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
15+
# gem 'therubyracer', platforms: :ruby
16+
17+
# Use jquery as the JavaScript library
18+
gem 'jquery-rails'
19+
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
20+
gem 'turbolinks'
21+
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
22+
gem 'jbuilder', '~> 2.0'
23+
# bundle exec rake doc:rails generates the API under doc/api.
24+
gem 'sdoc', '~> 0.4.0', group: :doc
25+
26+
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
27+
gem 'spring', group: :development
28+
29+
# Use ActiveModel has_secure_password
30+
# gem 'bcrypt', '~> 3.1.7'
31+
32+
# Use unicorn as the app server
33+
# gem 'unicorn'
34+
35+
# Use Capistrano for deployment
36+
# gem 'capistrano-rails', group: :development
37+
38+
# Use debugger
39+
# gem 'debugger', group: [:development, :test]
40+
41+
group :development do
42+
if(ENV['AUTOMATED_TEST'] && ENV['AUTOMATED_TEST'] != '')
43+
gem 'annotate', :path => ENV['AUTOMATED_TEST']
44+
else
45+
gem 'annotate', :path => '../../..'
46+
end
47+
end
48+
49+
gem 'rails-observers'
Lines changed: 158 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,158 @@
1+
PATH
2+
remote: ../../..
3+
specs:
4+
annotate (2.6.5)
5+
activerecord (>= 2.3.0)
6+
rake (>= 0.8.7)
7+
8+
GEM
9+
remote: https://rubygems.org/
10+
specs:
11+
actionmailer (4.2.0)
12+
actionpack (= 4.2.0)
13+
actionview (= 4.2.0)
14+
activejob (= 4.2.0)
15+
mail (~> 2.5, >= 2.5.4)
16+
rails-dom-testing (~> 1.0, >= 1.0.5)
17+
actionpack (4.2.0)
18+
actionview (= 4.2.0)
19+
activesupport (= 4.2.0)
20+
rack (~> 1.6.0)
21+
rack-test (~> 0.6.2)
22+
rails-dom-testing (~> 1.0, >= 1.0.5)
23+
rails-html-sanitizer (~> 1.0, >= 1.0.1)
24+
actionview (4.2.0)
25+
activesupport (= 4.2.0)
26+
builder (~> 3.1)
27+
erubis (~> 2.7.0)
28+
rails-dom-testing (~> 1.0, >= 1.0.5)
29+
rails-html-sanitizer (~> 1.0, >= 1.0.1)
30+
activejob (4.2.0)
31+
activesupport (= 4.2.0)
32+
globalid (>= 0.3.0)
33+
activemodel (4.2.0)
34+
activesupport (= 4.2.0)
35+
builder (~> 3.1)
36+
activerecord (4.2.0)
37+
activemodel (= 4.2.0)
38+
activesupport (= 4.2.0)
39+
arel (~> 6.0)
40+
activesupport (4.2.0)
41+
i18n (~> 0.7)
42+
json (~> 1.7, >= 1.7.7)
43+
minitest (~> 5.1)
44+
thread_safe (~> 0.3, >= 0.3.4)
45+
tzinfo (~> 1.1)
46+
arel (6.0.0)
47+
builder (3.2.2)
48+
coffee-rails (4.1.0)
49+
coffee-script (>= 2.2.0)
50+
railties (>= 4.0.0, < 5.0)
51+
coffee-script (2.3.0)
52+
coffee-script-source
53+
execjs
54+
coffee-script-source (1.8.0)
55+
erubis (2.7.0)
56+
execjs (2.2.2)
57+
globalid (0.3.0)
58+
activesupport (>= 4.1.0)
59+
hike (1.2.3)
60+
i18n (0.7.0)
61+
jbuilder (2.2.6)
62+
activesupport (>= 3.0.0, < 5)
63+
multi_json (~> 1.2)
64+
jquery-rails (4.0.2)
65+
rails-dom-testing (~> 1.0)
66+
railties (>= 4.2.0)
67+
thor (>= 0.14, < 2.0)
68+
json (1.8.1)
69+
loofah (2.0.1)
70+
nokogiri (>= 1.5.9)
71+
mail (2.6.3)
72+
mime-types (>= 1.16, < 3)
73+
mime-types (2.4.3)
74+
mini_portile (0.6.1)
75+
minitest (5.5.0)
76+
multi_json (1.10.1)
77+
nokogiri (1.6.5)
78+
mini_portile (~> 0.6.0)
79+
rack (1.6.0)
80+
rack-test (0.6.2)
81+
rack (>= 1.0)
82+
rails (4.2.0)
83+
actionmailer (= 4.2.0)
84+
actionpack (= 4.2.0)
85+
actionview (= 4.2.0)
86+
activejob (= 4.2.0)
87+
activemodel (= 4.2.0)
88+
activerecord (= 4.2.0)
89+
activesupport (= 4.2.0)
90+
bundler (>= 1.3.0, < 2.0)
91+
railties (= 4.2.0)
92+
sprockets-rails
93+
rails-deprecated_sanitizer (1.0.3)
94+
activesupport (>= 4.2.0.alpha)
95+
rails-dom-testing (1.0.5)
96+
activesupport (>= 4.2.0.beta, < 5.0)
97+
nokogiri (~> 1.6.0)
98+
rails-deprecated_sanitizer (>= 1.0.1)
99+
rails-html-sanitizer (1.0.1)
100+
loofah (~> 2.0)
101+
rails-observers (0.1.2)
102+
activemodel (~> 4.0)
103+
railties (4.2.0)
104+
actionpack (= 4.2.0)
105+
activesupport (= 4.2.0)
106+
rake (>= 0.8.7)
107+
thor (>= 0.18.1, < 2.0)
108+
rake (10.4.2)
109+
rdoc (4.2.0)
110+
json (~> 1.4)
111+
sass (3.4.9)
112+
sass-rails (5.0.0)
113+
railties (>= 4.0.0, < 5.0)
114+
sass (~> 3.1)
115+
sprockets (>= 2.8, < 4.0)
116+
sprockets-rails (>= 2.0, < 4.0)
117+
tilt (~> 1.1)
118+
sdoc (0.4.1)
119+
json (~> 1.7, >= 1.7.7)
120+
rdoc (~> 4.0)
121+
spring (1.2.0)
122+
sprockets (2.12.3)
123+
hike (~> 1.2)
124+
multi_json (~> 1.0)
125+
rack (~> 1.0)
126+
tilt (~> 1.1, != 1.3.0)
127+
sprockets-rails (2.2.2)
128+
actionpack (>= 3.0)
129+
activesupport (>= 3.0)
130+
sprockets (>= 2.8, < 4.0)
131+
sqlite3 (1.3.10)
132+
thor (0.19.1)
133+
thread_safe (0.3.4)
134+
tilt (1.4.1)
135+
turbolinks (2.5.3)
136+
coffee-rails
137+
tzinfo (1.2.2)
138+
thread_safe (~> 0.1)
139+
uglifier (2.6.0)
140+
execjs (>= 0.3.0)
141+
json (>= 1.8.0)
142+
143+
PLATFORMS
144+
ruby
145+
146+
DEPENDENCIES
147+
annotate!
148+
coffee-rails (~> 4.1.0)
149+
jbuilder (~> 2.0)
150+
jquery-rails
151+
rails (= 4.2.0)
152+
rails-observers
153+
sass-rails (~> 5.0)
154+
sdoc (~> 0.4.0)
155+
spring
156+
sqlite3
157+
turbolinks
158+
uglifier (>= 1.3.0)
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
== README
2+
3+
This README would normally document whatever steps are necessary to get the
4+
application up and running.
5+
6+
Things you may want to cover:
7+
8+
* Ruby version
9+
10+
* System dependencies
11+
12+
* Configuration
13+
14+
* Database creation
15+
16+
* Database initialization
17+
18+
* How to run the test suite
19+
20+
* Services (job queues, cache servers, search engines, etc.)
21+
22+
* Deployment instructions
23+
24+
* ...
25+
26+
27+
Please feel free to use a different markup language if you do not plan to run
28+
<tt>rake doc:app</tt>.

spec/integration/rails_4.2.0/Rakefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Add your own tasks in files placed in lib/tasks ending in .rake,
2+
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
3+
4+
require File.expand_path('../config/application', __FILE__)
5+
6+
Rails.application.load_tasks

spec/integration/rails_4.2.0/app/models/.keep

Whitespace-only changes.

spec/integration/rails_4.2.0/app/models/concerns/.keep

Whitespace-only changes.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module Sub1::Sub2::Sub3
2+
class Event < ActiveRecord::Base
3+
end
4+
end
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
class Sub1::User < ActiveRecord::Base
2+
end

0 commit comments

Comments
 (0)