Commit e9b8f2e4 authored by Stan Hu's avatar Stan Hu

Simplify spec based on review comments

parent 4c5880b6
......@@ -3,12 +3,10 @@
require 'spec_helper'
describe Projects::BranchesController do
let(:project) { create(:project, :repository) }
let(:user) { create(:user) }
set(:project) { create(:project, :repository) }
let(:user) { project.owner }
before do
project.add_maintainer(user)
allow(project).to receive(:branches).and_return(['master'])
controller.instance_variable_set(:@project, project)
......@@ -16,26 +14,26 @@ describe Projects::BranchesController do
end
describe 'GET #index' do
let(:import_state) { create(:import_state, next_execution_timestamp: Time.now, last_update_at: Time.now, last_successful_update_at: Time.now) }
render_views
before do
project.update!(mirror: true, import_state: import_state, import_url: 'https://import.url', mirror_user: user)
allow(project.repository).to receive(:diverged_from_upstream?) { true }
end
it 'renders the diverged from upstream partial' do
get :index,
format: :html,
params: {
namespace_id: project.namespace,
project_id: project,
state: 'all'
}
expect(controller).to render_template('projects/branches/_diverged_from_upstream')
expect(response.body).to match(/diverged from upstream/)
context 'for mirrored projects with diverged branch' do
render_views
before do
create(:import_state, :mirror, :finished, project: project, last_successful_update_at: Time.now)
allow(project.repository).to receive(:diverged_from_upstream?) { true }
end
it 'renders the diverged from upstream partial' do
get :index,
format: :html,
params: {
namespace_id: project.namespace,
project_id: project,
state: 'all'
}
expect(controller).to render_template('projects/branches/_diverged_from_upstream')
expect(response.body).to match(/diverged from upstream/)
end
end
end
end
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