Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
edbd287192
commit
810bb7ad35
2 changed files with 8 additions and 1 deletions
|
@ -35,4 +35,11 @@ RSpec.configure do |config|
|
||||||
config.filter_run focus: true
|
config.filter_run focus: true
|
||||||
config.run_all_when_everything_filtered = true
|
config.run_all_when_everything_filtered = true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Makes diffs show entire non-truncated values.
|
||||||
|
config.before(:each, unlimited_max_formatted_output_length: true) do |_example|
|
||||||
|
config.expect_with :rspec do |c|
|
||||||
|
c.max_formatted_output_length = nil
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -536,7 +536,7 @@ RSpec.describe Glfm::UpdateExampleSnapshots, '#process' do
|
||||||
# avoid slower tests, because generating the static HTML is slow due to the need to invoke
|
# avoid slower tests, because generating the static HTML is slow due to the need to invoke
|
||||||
# the rails environment. We could have separate sections, but this would require an extra flag
|
# the rails environment. We could have separate sections, but this would require an extra flag
|
||||||
# to the `process` method to independently skip static vs. WYSIWYG, which is not worth the effort.
|
# to the `process` method to independently skip static vs. WYSIWYG, which is not worth the effort.
|
||||||
it 'writes the correct content' do
|
it 'writes the correct content', :unlimited_max_formatted_output_length do
|
||||||
# expectation that skipping message is only output once per example
|
# expectation that skipping message is only output once per example
|
||||||
expect(subject).to receive(:output).once.with(/reason.*skipping this example because it is very bad/i)
|
expect(subject).to receive(:output).once.with(/reason.*skipping this example because it is very bad/i)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue