Skip to content

Backport frozen strings from trunk #3

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.

Sign up for GitHub

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

Merged
haileys merged 2 commits into from
Sep 5, 2013
Merged

Backport frozen strings from trunk #3

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af20309
backport fstrings
Sep 5, 2013
e8adba6
fix syntax errors
Sep 5, 2013
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
Prev Previous commit
fix syntax errors
  • Loading branch information
Charlie Somerville committed Sep 5, 2013
commit e8adba64a8747d307c14b3ac0879c800d3b6c6ce
6 changes: 3 additions & 3 deletions test/rake/test_rake_rules.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,9 @@ def test_recursive_rules_will_work_as_long_as_they_terminate
actions = []
create_file("abc.xml")
rule '.y' => '.xml' do actions << 'y' end
rule '.c' => '.y' do actions << 'c'end
rule '.o' => '.c' do actions << 'o'end
rule '.exe' => '.o' do actions << 'exe'end
rule '.c' => '.y' do actions << 'c' end
rule '.o' => '.c' do actions << 'o' end
rule '.exe' => '.o' do actions << 'exe' end
Task["abc.exe"].invoke
assert_equal ['y', 'c', 'o', 'exe'], actions
end
Expand Down
2 changes: 1 addition & 1 deletion test/rss/rss-assertions.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ def assert_atom_text_construct(tag_name, generator)
_wrap_assertion do
[nil, "text", "html"].each do |type|
attr = ""
attr = " type=\"#{type}\""if type
attr = " type=\"#{type}\"" if type
assert_parse(generator.call(<<-EOA), :nothing_raised)
<#{tag_name}#{attr}/>
EOA
Expand Down