Skip to content

Fix the branch 2-4-stable has errors and failure in spec #958

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

Jump to bottom
Closed
wants to merge 4 commits into from
Closed

Fix the branch 2-4-stable has errors and failure in spec #958

wants to merge 4 commits into from

Conversation

wktk
Copy link

@wktk wktk commented Jan 19, 2016

No description provided.

jeremy
jeremy reviewed Jan 19, 2016
View reviewed changes
Gemfile
gem "tlsmail" if RUBY_VERSION <= '1.8.6'
gem "mime-types", "~> 1.16"
gem "treetop", "~> 1.4.10"
gem "i18n", ">= 0.4.0"
gem "i18n", "~> 0.6.11"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'>= 0.4.0', '< 0.7.0'

@wktk wktk force-pushed the 2-4-stable-fix-spec branch from 5544acb to c03b7df Compare January 19, 2016 19:55
jeremy
jeremy reviewed Apr 6, 2016
View reviewed changes
lib/mail/version_specific/ruby_1_9.rb
@@ -68,7 +68,7 @@ def Ruby19.q_value_decode(str)
match = str.match(/\=\?(.+)?\?[Qq]\?(.+)?\?\=/m)
if match
encoding = match[1]
str = Encodings::QuotedPrintable.decode(match[2].gsub(/_/, '=20'))
str = Encodings::QuotedPrintable.decode(match[2].gsub(/_/, '=20').gsub(/\=$/, ''))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is this backporting?

Can you cherry-pick the backported commit directly, preserving the commit message, author, spec, etc?

@wktk wktk force-pushed the 2-4-stable-fix-spec branch from c03b7df to 92acb6b Compare May 27, 2016 09:44
wktk and others added 2 commits May 27, 2016 18:49
@wktk
Avoid gems which require ruby (>= 1.9.3)
5ec84ae 
- i18n (0.7.0) requires ruby (>= 1.9.3)
- activesupport (4.0.0) requires ruby (>= 1.9.3)
- rake (11.0.1) requires ruby (>= 1.9.3)
@wktk
Fix broken spec for issue 453 and change documentation
6e12d7f
@wktk wktk force-pushed the 2-4-stable-fix-spec branch from 92acb6b to 6e12d7f Compare May 27, 2016 09:49
@wktk
Copy link
Author

wktk commented May 27, 2016

@jeremy I updated Gemfile and gemspec not to break compatibility for 1.9.3+, and cherry-picked the backported commit to fix spec. The test of 6e12d7f has failed because Mail::Messages which should be equal are generated 1 second apart and regarded different, so I also cherry-picked db7c955 to solve that. db7c955 is written in newer syntax of RSpec, so I fixed it in 0bf9f90.
Can you review?

jeremy pushed a commit that referenced this pull request May 15, 2017
@wktk @jeremy
Backport fixes for specs on Ruby 1.9.3+
2a9061c 
Avoid gems which dropped support for Ruby 1.8:
- i18n (0.7.0) requires ruby (>= 1.9.3)
- activesupport (4.0.0) requires ruby (>= 1.9.3)
- rake (11.0.1) requires ruby (>= 1.9.3)

Backport 6e12d7f to fix #453.

Backport db7c955 to fix a brittle spec.

Closes #958
@jeremy jeremy added this to the 2.4.5 milestone May 15, 2017
jeremy pushed a commit that referenced this pull request May 15, 2017
@wktk @jeremy
Backport fixes for specs on Ruby 1.9.3+
b5a2884 
Avoid gems which dropped support for Ruby 1.8:
- activesupport (4.0.0) requires ruby (>= 1.9.3)
- rake (11.0.1) requires ruby (>= 1.9.3)

Backport 6e12d7f to fix #453.

Backport db7c955 to fix a brittle spec.

References #958
@jeremy
Copy link
Collaborator

jeremy commented May 16, 2017

Closed by 2a9061c

@jeremy jeremy closed this May 16, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
2.4.5
Development

Successfully merging this pull request may close these issues.
3 participants
@wktk @jeremy @grosser