Skip to content

Commit 1d06d46

Browse files
committed
Cleanup Initializer and Tests
Mixing `app/` helpers once. Simplify the tests' controllers, deferring logic to the default `HighVoltage` controllers.
1 parent 9ebe866 commit 1d06d46

File tree

4 files changed

+2
-16
lines changed

4 files changed

+2
-16
lines changed

lib/ember_cli/engine.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
module EmberCli
22
class Engine < Rails::Engine
3-
initializer "ember-cli-rails.rendering" do
3+
initializer "ember-cli-rails.setup" do
44
require "ember_cli/ember_controller"
55
require "ember_cli/route_helpers"
6-
end
76

8-
config.to_prepare do
97
ActionController::Base.helper EmberRailsHelper
108
end
119
end

spec/dummy/app/controllers/pages_controller.rb

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
HighVoltage.configure do |config|
22
config.layout = false
3-
config.routes = false
43
end

spec/dummy/config/routes.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Rails.application.routes.draw do
2-
with_options controller: "pages", action: "show" do |app|
2+
with_options controller: "high_voltage/pages", action: "show" do |app|
33
app.mount_ember_app(
44
"my-app",
55
to: "/no-block",

0 commit comments

Comments
 (0)