Skip to content

Commit 9de2a20

Browse files
committed
update to 5.0.0-beta3
1 parent b43ae16 commit 9de2a20

File tree

4 files changed

+12
-15
lines changed

4 files changed

+12
-15
lines changed

Appraisals

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ appraise "4.2" do
1010
gem "rails", "~> 4.2.1"
1111
end
1212

13-
appraise "5.0.0.beta2" do
14-
gem "rails", "5.0.0.beta2"
13+
appraise "5.0.0.beta3" do
14+
gem "rails", "5.0.0.beta3"
1515
end
1616

1717
appraise "master" do

app/controller/ember_cli/ember_controller.rb

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
module EmberCli
22
class EmberController < ::ApplicationController
3-
(::ActionController::Base::MODULES - ::ActionController::API::MODULES).each do |mod|
4-
include mod
5-
end
6-
3+
# (
4+
# ::ActionController::Base::MODULES -
5+
# ::ActionController::API::MODULES
6+
# ).each do |mod|
7+
# include mod
8+
# end
9+
#
710
def index
811
render layout: false
912
end

gemfiles/5.0.0.beta2.gemfile renamed to gemfiles/5.0.0.beta3.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "https://rubygems.org"
44

55
gem "appraisal"
6-
gem "rails", "5.0.0.beta2"
6+
gem "rails", "5.0.0.beta3"
77
gem "pry"
88

99
group :development, :test do

spec/lib/ember_cli/app_spec.rb

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727

2828
describe "#compile" do
2929
it "exits with exit status of 0" do
30-
passed = silence_stdout { EmberCli["my-app"].compile }
30+
passed = EmberCli["my-app"].compile
3131

3232
expect(passed).to be true
3333
end
3434
end
3535

3636
describe "#test" do
3737
it "exits with exit status of 0" do
38-
passed = silence_stdout { EmberCli["my-app"].test }
38+
passed = EmberCli["my-app"].test
3939

4040
expect(passed).to be true
4141
end
@@ -65,12 +65,6 @@
6565
end
6666
end
6767

68-
def silence_stdout
69-
silence_stream($stdout) do
70-
yield
71-
end
72-
end
73-
7468
def stub_paths(method_to_value)
7569
allow_any_instance_of(EmberCli::PathSet).
7670
to receive(method_to_value.keys.first).

0 commit comments

Comments
 (0)