Commit 7ca4ba87 authored by Clement Ho's avatar Clement Ho

Merge branch 'vrt-appear' into 'master'

Visual Review: Fix the typo preventing the button from displaying

See merge request gitlab-org/gitlab-ee!14373
parents c55b6d93 36407de5
......@@ -31,7 +31,7 @@ export default class MergeRequestStore extends CEMergeRequestStore {
this.canDismissVulnerability = Boolean(this.createVulnerabilityFeedbackDismissalPath);
this.canCreateFeedback = data.can_create_feedback || false;
this.visualReviewAppAvailable = data.visual_review_app_available;
this.visualReviewFF = gon && gon.featues && gon.features.visualReviewApp;
this.visualReviewFF = gon && gon.features && gon.features.visualReviewApp;
this.appUrl = gon && gon.gitlab_url;
this.initCodeclimate(data);
......
# frozen_string_literal: true
require 'rails_helper'
describe 'Merge request > User sees deployment widget', :js do
describe 'when merge request has associated environments' do
let(:user) { create(:user) }
let(:project) { create(:project, :repository) }
let(:merge_request) { create(:merge_request, :merged, source_project: project) }
let(:environment) { create(:environment, project: project) }
let(:role) { :developer }
let(:ref) { merge_request.target_branch }
let(:sha) { project.commit(ref).id }
let(:pipeline) { create(:ci_pipeline_without_jobs, sha: sha, project: project, ref: ref) }
let!(:manual) { }
before do
merge_request.update!(merge_commit_sha: sha)
project.add_user(user, role)
sign_in(user)
end
context 'when deployment succeeded' do
let(:build) { create(:ci_build, :success, pipeline: pipeline) }
let!(:deployment) { create(:deployment, :succeed, environment: environment, sha: sha, ref: ref, deployable: build) }
context 'when the license flag is enabled' do
before do
stub_licensed_features(visual_review_app: true)
end
it 'displays the visual review button' do
visit project_merge_request_path(project, merge_request)
wait_for_requests
expect(page).to have_selector('.js-review-button')
end
end
context 'when the license flag is disabled' do
before do
stub_licensed_features(visual_review_app: false)
end
it 'does not display the button' do
visit project_merge_request_path(project, merge_request)
wait_for_requests
expect(page).not_to have_selector('.js-review-button')
end
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