Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Fix tests broken in 3.0 due to separation of keyword arguments 

Tests fail in Ruby 3.0 and later due to separation of positional and
keyword arguments. RSpec treats the hash at the end of include_examples
as keyword arguments when it should be passed as a positional argument.
This commit is contained in:
Peter Zhu 2022-01-05 13:12:50 -05:00 committed by Robin Ward
parent 22e8f8af6d
commit ab33d44bf6
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
spec/requests/topics_controller_spec.rb
View File

@ -1959,7 +1959,7 @@ RSpec.describe TopicsController do
let!(:nonexistent_topic_id) { Topic.last.id + 10000 }
fab!(:secure_accessible_topic) { Fabricate(:topic, category: accessible_category) }
shared_examples "various scenarios" do |expected, request_json: false|
shared_examples "various scenarios" do |expected, request_json:|
expected.each do |key, value|
it "returns #{value} for #{key}" do
slug = key == :nonexistent ? "garbage-slug" : send(key.to_s).slug
@ -1994,7 +1994,7 @@ RSpec.describe TopicsController do
nonexistent: 404,
secure_accessible_topic: 404
}
include_examples "various scenarios", expected
include_examples "various scenarios", expected, request_json: false
end
context 'anonymous with login required' do
@ -2011,7 +2011,7 @@ RSpec.describe TopicsController do
nonexistent: 302,
secure_accessible_topic: 302
}
include_examples "various scenarios", expected
include_examples "various scenarios", expected, request_json: false
end
context 'anonymous with login required, requesting json' do
@ -2046,7 +2046,7 @@ RSpec.describe TopicsController do
nonexistent: 404,
secure_accessible_topic: 404
}
include_examples "various scenarios", expected
include_examples "various scenarios", expected, request_json: false
end
context 'allowed user' do
@ -2064,7 +2064,7 @@ RSpec.describe TopicsController do
nonexistent: 404,
secure_accessible_topic: 404
}
include_examples "various scenarios", expected
include_examples "various scenarios", expected, request_json: false
end
context 'moderator' do
@ -2082,7 +2082,7 @@ RSpec.describe TopicsController do
nonexistent: 404,
secure_accessible_topic: 404
}
include_examples "various scenarios", expected
include_examples "various scenarios", expected, request_json: false
end
context 'admin' do
@ -2100,7 +2100,7 @@ RSpec.describe TopicsController do
nonexistent: 404,
secure_accessible_topic: 200
}
include_examples "various scenarios", expected
include_examples "various scenarios", expected, request_json: false
end
end
@ -2137,7 +2137,7 @@ RSpec.describe TopicsController do
nonexistent: 302,
secure_accessible_topic: 302
}
include_examples "various scenarios", expected
include_examples "various scenarios", expected, request_json: false
end
context 'normal user' do
@ -2173,7 +2173,7 @@ RSpec.describe TopicsController do
nonexistent: 404,
secure_accessible_topic: 403
}
include_examples "various scenarios", expected
include_examples "various scenarios", expected, request_json: false
end
context 'moderator' do
@ -2191,7 +2191,7 @@ RSpec.describe TopicsController do
nonexistent: 404,
secure_accessible_topic: 403
}
include_examples "various scenarios", expected
include_examples "various scenarios", expected, request_json: false
end
context 'admin' do
@ -2209,7 +2209,7 @@ RSpec.describe TopicsController do
nonexistent: 404,
secure_accessible_topic: 200
}
include_examples "various scenarios", expected
include_examples "various scenarios", expected, request_json: false
end
end