Commit 6bf1beaf authored by Stan Hu's avatar Stan Hu

Merge branch 'fix-cache-clear-test-issue' into 'master'

Use project repository expire_cache to clear cache in test

Clearing the entire Redis cache in 643557da for the `branches_spec.rb` may be causing issues. Just clear what we need.

See merge request !1022
parents dc550481 5aff5223
......@@ -13,13 +13,9 @@ describe API::API, api: true do
let!(:branch_sha) { '0b4bc9a49b562e85de7cc9e834518ea6828729b9' }
describe "GET /projects/:id/repository/branches" do
before do
# Ensure that repository.branch_names is cleared from the cache at start to ensure
# the list matches reality
Rails.cache.clear
end
it "should return an array of project branches" do
project.repository.expire_cache
get api("/projects/#{project.id}/repository/branches", user)
expect(response.status).to eq(200)
expect(json_response).to be_an Array
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment