Skip to content

[fix-1921] use relative path when no fixture_path configured #1943

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

Merged
merged 6 commits into from
Mar 12, 2018

Conversation

11factory
Copy link
Contributor

@11factory 11factory commented Jan 12, 2018

related to issue #1921

Copy link
Member

@JonRowe JonRowe left a comment

Choose a reason for hiding this comment

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

Looks good, when we can get a green build this should be merged, I will request you undo the spacing change however.

if ActionController::TestCase.respond_to?(:fixture_path)
ActionController::TestCase.fixture_path = value
end
ActionController::TestCase.fixture_path = value if ActionController::TestCase.respond_to?(:fixture_path)
Copy link
Member

Choose a reason for hiding this comment

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

Please undo this.

@11factory 11factory force-pushed the fix-1921 branch 2 times, most recently from f82af8a to e965f58 Compare January 12, 2018 13:11
@11factory
Copy link
Contributor Author

@JonRowe changes have been done, CI seems already broken before my change

@JonRowe
Copy link
Member

JonRowe commented Jan 26, 2018

Sadly master is broken thats correct but your branch is more broken than master, so I'd really like to see a green build here! I'm trying to tackle master myself but it might take a while.

@JonRowe
Copy link
Member

JonRowe commented Jan 28, 2018

I have a green build over in #1950, you could consider rebasing your branch off that to see if your build goes green.

@JonRowe
Copy link
Member

JonRowe commented Jan 29, 2018

#1950 has now been merged so you should be able to get a green build if you rebase / merge master

@11factory
Copy link
Contributor Author

ping @JonRowe

@JonRowe JonRowe merged commit 06b1590 into rspec:master Mar 12, 2018
JonRowe added a commit that referenced this pull request Mar 12, 2018
sebjacobs pushed a commit to futurelearn/rspec-rails that referenced this pull request Mar 15, 2019
sebjacobs pushed a commit to futurelearn/rspec-rails that referenced this pull request Mar 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants