Skip to content

Commit

Permalink
Merge pull request #762 from kianmeng/fix-typos
Browse files Browse the repository at this point in the history
  • Loading branch information
nesquena committed Mar 15, 2024
2 parents 34d7dcb + 5862414 commit 3dc2dc5
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Expand Up @@ -15,7 +15,7 @@


* Support for Rails 7 (@tagliala) * Support for Rails 7 (@tagliala)
* Improvements to unit testing * Improvements to unit testing
* Miscellanious other bug fixes * Miscellaneous other bug fixes


## 0.14.5 (May 29th, 2021) ## 0.14.5 (May 29th, 2021)


Expand Down
2 changes: 1 addition & 1 deletion fixtures/padrino_test/config/database.rb
Expand Up @@ -39,5 +39,5 @@
# if you're including raw json in an HTML page. # if you're including raw json in an HTML page.
ActiveSupport.escape_html_entities_in_json = false ActiveSupport.escape_html_entities_in_json = false


# Now we can estabilish connection with our db # Now we can establish connection with our db
ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[Padrino.env]) ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[Padrino.env])
2 changes: 1 addition & 1 deletion lib/rabl/renderer.rb
Expand Up @@ -42,7 +42,7 @@ def initialize(source, object = nil, options = {})
# - context_scope: # - context_scope:
# Override the render context_scope to the 'context_scope' object. Defaults to self. # Override the render context_scope to the 'context_scope' object. Defaults to self.
# #
# Returns: And object representing the tranformed object in the requested format. # Returns: And object representing the transformed object in the requested format.
# e.g. json, xml, bson, plist # e.g. json, xml, bson, plist
def render(context_scope = nil) def render(context_scope = nil)
context_scope ||= options[:scope] || self context_scope ||= options[:scope] || self
Expand Down
4 changes: 2 additions & 2 deletions test/bson_engine_test.rb
Expand Up @@ -85,7 +85,7 @@
end end


context "#code" do context "#code" do
asserts "that it can create an arbitraty code node" do asserts "that it can create an arbitrary code node" do
template = rabl %{ template = rabl %{
code(:foo) { 'bar' } code(:foo) { 'bar' }
} }
Expand Down Expand Up @@ -250,7 +250,7 @@ def self.serialize string
end end


context "#code" do context "#code" do
asserts "that it can create an arbitraty code node" do asserts "that it can create an arbitrary code node" do
template = rabl %{ template = rabl %{
code(:foo) { 'bar' } code(:foo) { 'bar' }
} }
Expand Down
2 changes: 1 addition & 1 deletion test/builder_test.rb
Expand Up @@ -257,7 +257,7 @@
b.to_hash(@user) b.to_hash(@user)
end.equivalent_to({ :user => { :name => "rabl" } }) end.equivalent_to({ :user => { :name => "rabl" } })


asserts "that it does't duplicate childs with the same name as a string and symbol" do asserts "that it doesn't duplicate children with the same name as a string and symbol" do
b = builder(nil, :child => [ b = builder(nil, :child => [
{ :data => { @user => "user" }, :options => { }, :block => lambda { |u| attribute :name } }, { :data => { @user => "user" }, :options => { }, :block => lambda { |u| attribute :name } },
{ :data => { @user => :user }, :options => { }, :block => lambda { |u| attribute :name } } { :data => { @user => :user }, :options => { }, :block => lambda { |u| attribute :name } }
Expand Down
4 changes: 2 additions & 2 deletions test/engine_test.rb
Expand Up @@ -312,7 +312,7 @@ def obj.func(arg, kw:)
end end


context "#code" do context "#code" do
asserts "that it can create an arbitraty code node" do asserts "that it can create an arbitrary code node" do
template = rabl %{ template = rabl %{
code(:foo) { 'bar' } code(:foo) { 'bar' }
} }
Expand Down Expand Up @@ -705,7 +705,7 @@ def obj.func(arg, kw:)
end # attribute end # attribute


context "#code" do context "#code" do
asserts "that it can create an arbitraty code node" do asserts "that it can create an arbitrary code node" do
template = rabl %{ template = rabl %{
code(:foo) { 'bar' } code(:foo) { 'bar' }
} }
Expand Down
4 changes: 2 additions & 2 deletions test/msgpack_engine_test.rb
Expand Up @@ -87,7 +87,7 @@
end end


context "#code" do context "#code" do
asserts "that it can create an arbitraty code node" do asserts "that it can create an arbitrary code node" do
template = rabl %{ template = rabl %{
code(:foo) { 'bar' } code(:foo) { 'bar' }
} }
Expand Down Expand Up @@ -252,7 +252,7 @@ def self.pack string
end end


context "#code" do context "#code" do
asserts "that it can create an arbitraty code node" do asserts "that it can create an arbitrary code node" do
template = rabl %{ template = rabl %{
code(:foo) { 'bar' } code(:foo) { 'bar' }
} }
Expand Down
2 changes: 1 addition & 1 deletion test/plist_engine_test.rb
Expand Up @@ -85,7 +85,7 @@
end end


context "#code" do context "#code" do
asserts "that it can create an arbitraty code node" do asserts "that it can create an arbitrary code node" do
template = rabl %{ template = rabl %{
code(:foo) { 'bar' } code(:foo) { 'bar' }
} }
Expand Down
2 changes: 1 addition & 1 deletion test/xml_test.rb
Expand Up @@ -93,7 +93,7 @@
end end


context "#code" do context "#code" do
asserts "that it can create an arbitraty code node" do asserts "that it can create an arbitrary code node" do
template = rabl %{ template = rabl %{
code(:foo) { 'bar' } code(:foo) { 'bar' }
} }
Expand Down

0 comments on commit 3dc2dc5

Please sign in to comment.