Skip to content

Commit 23e3db0

Browse files
committed
Upgrade testbed from rails-4.0-rc1 to rails-4.0
1 parent c98ace2 commit 23e3db0

File tree

6 files changed

+60
-60
lines changed

6 files changed

+60
-60
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ script: "rake testbed:current:all"
1414
gemfile:
1515
- gemfiles/rails-3.1
1616
- gemfiles/rails-3.2
17-
- gemfiles/rails-4.0-rc1
17+
- gemfiles/rails-4.0

Bedfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ store_in 'spec/testbeds'
33
testbeds do
44
gemfiles 'gemfiles/rails-3.1',
55
'gemfiles/rails-3.2',
6-
'gemfiles/rails-4.0-rc1'
6+
'gemfiles/rails-4.0'
77

88
init do
99
run 'rails', 'new', name, '--skip-gemfile', '--skip-bundle'

gemfiles/rails-3.1.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
2-
remote: /Users/colin/projects/gems/jasmine-rails
2+
remote: /vagrant/projects/ruby/jasmine-rails
33
specs:
4-
jasmine-rails (0.4.6)
4+
jasmine-rails (0.4.5)
55
jasmine-core (~> 1.3)
66
rails (>= 3.1.0)
77
sprockets-rails

gemfiles/rails-3.2.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
2-
remote: /Users/colin/projects/gems/jasmine-rails
2+
remote: /vagrant/projects/ruby/jasmine-rails
33
specs:
4-
jasmine-rails (0.4.6)
4+
jasmine-rails (0.4.5)
55
jasmine-core (~> 1.3)
66
rails (>= 3.1.0)
77
sprockets-rails

gemfiles/rails-4.0-rc1 renamed to gemfiles/rails-4.0

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ source "http://rubygems.org"
33
gemspec path: File.expand_path('..', File.dirname(__FILE__))
44

55
# Gems used by the dummy application
6-
gem 'rails', '~> 4.0.0.rc1'
7-
gem 'coffee-rails', '~> 4.0.0.rc1'
8-
gem 'sass-rails', '~> 4.0.0.rc1'
6+
gem 'rails', '~> 4.0.0'
7+
gem 'coffee-rails', '~> 4.0.0'
8+
gem 'sass-rails', '~> 4.0.0'
99
gem 'turbolinks'
1010

1111
gem "jquery-rails"
Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
PATH
2-
remote: /Users/colin/projects/gems/jasmine-rails
2+
remote: /vagrant/projects/ruby/jasmine-rails
33
specs:
4-
jasmine-rails (0.4.6)
4+
jasmine-rails (0.4.5)
55
jasmine-core (~> 1.3)
66
rails (>= 3.1.0)
77
sprockets-rails
88

99
GEM
1010
remote: http://rubygems.org/
1111
specs:
12-
actionmailer (4.0.0.rc1)
13-
actionpack (= 4.0.0.rc1)
12+
actionmailer (4.0.0)
13+
actionpack (= 4.0.0)
1414
mail (~> 2.5.3)
15-
actionpack (4.0.0.rc1)
16-
activesupport (= 4.0.0.rc1)
15+
actionpack (4.0.0)
16+
activesupport (= 4.0.0)
1717
builder (~> 3.1.0)
1818
erubis (~> 2.7.0)
1919
rack (~> 1.5.2)
2020
rack-test (~> 0.6.2)
21-
activemodel (4.0.0.rc1)
22-
activesupport (= 4.0.0.rc1)
21+
activemodel (4.0.0)
22+
activesupport (= 4.0.0)
2323
builder (~> 3.1.0)
24-
activerecord (4.0.0.rc1)
25-
activemodel (= 4.0.0.rc1)
24+
activerecord (4.0.0)
25+
activemodel (= 4.0.0)
2626
activerecord-deprecated_finders (~> 1.0.2)
27-
activesupport (= 4.0.0.rc1)
27+
activesupport (= 4.0.0)
2828
arel (~> 4.0.0)
29-
activerecord-deprecated_finders (1.0.2)
30-
activesupport (4.0.0.rc1)
29+
activerecord-deprecated_finders (1.0.3)
30+
activesupport (4.0.0)
3131
i18n (~> 0.6, >= 0.6.4)
3232
minitest (~> 4.2)
3333
multi_json (~> 1.3)
3434
thread_safe (~> 0.1)
3535
tzinfo (~> 0.3.37)
3636
arel (4.0.0)
37-
atomic (1.1.9)
37+
atomic (1.1.10)
3838
builder (3.1.4)
3939
capybara (2.1.0)
4040
mime-types (>= 1.16)
@@ -49,30 +49,31 @@ GEM
4949
coffee-script (2.2.0)
5050
coffee-script-source
5151
execjs
52-
coffee-script-source (1.6.2)
52+
coffee-script-source (1.6.3)
5353
diff-lcs (1.2.4)
5454
erubis (2.7.0)
5555
eventmachine (1.0.3)
5656
execjs (1.4.0)
5757
multi_json (~> 1.0)
5858
faye-websocket (0.4.7)
5959
eventmachine (>= 0.12.0)
60-
hike (1.2.2)
60+
hike (1.2.3)
6161
http_parser.rb (0.5.3)
6262
i18n (0.6.4)
6363
jasmine-core (1.3.1)
64-
jquery-rails (2.2.1)
64+
jquery-rails (3.0.4)
6565
railties (>= 3.0, < 5.0)
6666
thor (>= 0.14, < 2.0)
67-
mail (2.5.3)
68-
i18n (>= 0.4.0)
67+
mail (2.5.4)
6968
mime-types (~> 1.16)
7069
treetop (~> 1.4.8)
7170
method_source (0.8.1)
7271
mime-types (1.23)
73-
minitest (4.7.4)
74-
multi_json (1.7.3)
75-
nokogiri (1.5.9)
72+
mini_portile (0.5.1)
73+
minitest (4.7.5)
74+
multi_json (1.7.7)
75+
nokogiri (1.6.0)
76+
mini_portile (~> 0.5.0)
7677
poltergeist (1.3.0)
7778
capybara (~> 2.1.0)
7879
faye-websocket (>= 0.4.4, < 0.5.0)
@@ -85,44 +86,43 @@ GEM
8586
rack (1.5.2)
8687
rack-test (0.6.2)
8788
rack (>= 1.0)
88-
rails (4.0.0.rc1)
89-
actionmailer (= 4.0.0.rc1)
90-
actionpack (= 4.0.0.rc1)
91-
activerecord (= 4.0.0.rc1)
92-
activesupport (= 4.0.0.rc1)
89+
rails (4.0.0)
90+
actionmailer (= 4.0.0)
91+
actionpack (= 4.0.0)
92+
activerecord (= 4.0.0)
93+
activesupport (= 4.0.0)
9394
bundler (>= 1.3.0, < 2.0)
94-
railties (= 4.0.0.rc1)
95-
sprockets-rails (~> 2.0.0.rc4)
96-
railties (4.0.0.rc1)
97-
actionpack (= 4.0.0.rc1)
98-
activesupport (= 4.0.0.rc1)
95+
railties (= 4.0.0)
96+
sprockets-rails (~> 2.0.0)
97+
railties (4.0.0)
98+
actionpack (= 4.0.0)
99+
activesupport (= 4.0.0)
99100
rake (>= 0.8.7)
100101
thor (>= 0.18.1, < 2.0)
101-
rake (10.0.4)
102-
rspec-core (2.13.1)
103-
rspec-expectations (2.13.0)
102+
rake (10.1.0)
103+
rspec-core (2.14.2)
104+
rspec-expectations (2.14.0)
104105
diff-lcs (>= 1.1.3, < 2.0)
105-
rspec-mocks (2.13.1)
106-
rspec-rails (2.13.1)
106+
rspec-mocks (2.14.1)
107+
rspec-rails (2.14.0)
107108
actionpack (>= 3.0)
108109
activesupport (>= 3.0)
109110
railties (>= 3.0)
110-
rspec-core (~> 2.13.0)
111-
rspec-expectations (~> 2.13.0)
112-
rspec-mocks (~> 2.13.0)
111+
rspec-core (~> 2.14.0)
112+
rspec-expectations (~> 2.14.0)
113+
rspec-mocks (~> 2.14.0)
113114
sass (3.2.9)
114-
sass-rails (4.0.0.rc1)
115+
sass-rails (4.0.0)
115116
railties (>= 4.0.0.beta, < 5.0)
116117
sass (>= 3.1.10)
117-
sprockets-rails (~> 2.0.0.rc0)
118-
tilt (~> 1.3)
119-
slop (3.4.4)
120-
sprockets (2.9.3)
118+
sprockets-rails (~> 2.0.0)
119+
slop (3.4.5)
120+
sprockets (2.10.0)
121121
hike (~> 1.2)
122122
multi_json (~> 1.0)
123123
rack (~> 1.0)
124124
tilt (~> 1.1, != 1.3.0)
125-
sprockets-rails (2.0.0.rc4)
125+
sprockets-rails (2.0.0)
126126
actionpack (>= 3.0)
127127
activesupport (>= 3.0)
128128
sprockets (~> 2.8)
@@ -132,10 +132,10 @@ GEM
132132
thread_safe (0.1.0)
133133
atomic
134134
tilt (1.4.1)
135-
treetop (1.4.12)
135+
treetop (1.4.14)
136136
polyglot
137137
polyglot (>= 0.3.1)
138-
turbolinks (1.1.1)
138+
turbolinks (1.3.0)
139139
coffee-rails
140140
tzinfo (0.3.37)
141141
xpath (2.0.0)
@@ -146,14 +146,14 @@ PLATFORMS
146146

147147
DEPENDENCIES
148148
capybara
149-
coffee-rails (~> 4.0.0.rc1)
149+
coffee-rails (~> 4.0.0)
150150
jasmine-rails!
151151
jquery-rails
152152
poltergeist
153153
pry
154-
rails (~> 4.0.0.rc1)
154+
rails (~> 4.0.0)
155155
rspec-rails
156-
sass-rails (~> 4.0.0.rc1)
156+
sass-rails (~> 4.0.0)
157157
sqlite3
158158
testbeds
159159
turbolinks

0 commit comments

Comments
 (0)