Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🌈The klass parameter 'inject_into_class' should be given a string type.(also inject_into_module) #752

Merged
merged 1 commit into from
May 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/thor/actions/file_manipulation.rb
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,9 @@ def append_to_file(path, *args, &block)
#
# ==== Examples
#
# inject_into_class "app/controllers/application_controller.rb", ApplicationController, " filter_parameter :password\n"
# inject_into_class "app/controllers/application_controller.rb", "ApplicationController", " filter_parameter :password\n"
#
# inject_into_class "app/controllers/application_controller.rb", ApplicationController do
# inject_into_class "app/controllers/application_controller.rb", "ApplicationController" do
# " filter_parameter :password\n"
# end
#
Expand All @@ -233,9 +233,9 @@ def inject_into_class(path, klass, *args, &block)
#
# ==== Examples
#
# inject_into_module "app/helpers/application_helper.rb", ApplicationHelper, " def help; 'help'; end\n"
# inject_into_module "app/helpers/application_helper.rb", "ApplicationHelper", " def help; 'help'; end\n"
#
# inject_into_module "app/helpers/application_helper.rb", ApplicationHelper do
# inject_into_module "app/helpers/application_helper.rb", "ApplicationHelper" do
# " def help; 'help'; end\n"
# end
#
Expand Down
15 changes: 6 additions & 9 deletions spec/actions/file_manipulation_spec.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
require "helper"

class Application; end
module ApplicationHelper; end

describe Thor::Actions do
def runner(options = {}, behavior = :invoke)
@runner ||= MyCounter.new([1], options, :destination_root => destination_root, :behavior => behavior)
Expand Down Expand Up @@ -407,17 +404,17 @@ def file
end

it "appends content to a class" do
action :inject_into_class, "application.rb", Application, " filter_parameters :password\n"
action :inject_into_class, "application.rb", "Application", " filter_parameters :password\n"
expect(File.binread(file)).to eq("class Application < Base\n filter_parameters :password\nend\n")
end

it "accepts a block" do
action(:inject_into_class, "application.rb", Application) { " filter_parameters :password\n" }
action(:inject_into_class, "application.rb", "Application") { " filter_parameters :password\n" }
expect(File.binread(file)).to eq("class Application < Base\n filter_parameters :password\nend\n")
end

it "logs status" do
expect(action(:inject_into_class, "application.rb", Application, " filter_parameters :password\n")).to eq(" insert application.rb\n")
expect(action(:inject_into_class, "application.rb", "Application", " filter_parameters :password\n")).to eq(" insert application.rb\n")
end

it "does not append if class name does not match" do
Expand All @@ -432,17 +429,17 @@ def file
end

it "appends content to a module" do
action :inject_into_module, "application_helper.rb", ApplicationHelper, " def help; 'help'; end\n"
action :inject_into_module, "application_helper.rb", "ApplicationHelper", " def help; 'help'; end\n"
expect(File.binread(file)).to eq("module ApplicationHelper\n def help; 'help'; end\nend\n")
end

it "accepts a block" do
action(:inject_into_module, "application_helper.rb", ApplicationHelper) { " def help; 'help'; end\n" }
action(:inject_into_module, "application_helper.rb", "ApplicationHelper") { " def help; 'help'; end\n" }
expect(File.binread(file)).to eq("module ApplicationHelper\n def help; 'help'; end\nend\n")
end

it "logs status" do
expect(action(:inject_into_module, "application_helper.rb", ApplicationHelper, " def help; 'help'; end\n")).to eq(" insert application_helper.rb\n")
expect(action(:inject_into_module, "application_helper.rb", "ApplicationHelper", " def help; 'help'; end\n")).to eq(" insert application_helper.rb\n")
end

it "does not append if module name does not match" do
Expand Down