kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add feature specs

Browse source
This commit is contained in:
Douwe Maan 2017-02-01 15:49:20 -06:00
parent 3dfb6a3094
commit 6edc8d50dc
8 changed files with 147 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/projects/blob_controller.rb
View file

@ -30,8 +30,8 @@ class Projects::BlobController < Projects::ApplicationController
end
def show
branch_name = @ref if @repository.branch_exists?(@ref)
@environment = @project.environments_for(commit: @commit, ref: branch_name).last
environment_args = @repository.branch_exists?(@ref) ? { ref: @ref } : { commit: @commit }
@environment = @project.environments_for(**environment_args).last
@environment = nil unless can?(current_user, :read_environment, @environment)
end

4
app/controllers/projects/compare_controller.rb
View file

@ -57,8 +57,8 @@ class Projects::CompareController < Projects::ApplicationController
@diffs = @compare.diffs(diff_options)
branch_name = @head_ref if @repository.branch_exists?(@head_ref)
@environment = @project.environments_for(commit: @commit, ref: branch_name).last
environment_args = @repository.branch_exists?(@head_ref) ? { ref: @head_ref } : { commit: @commit }
@environment = @project.environments_for(**environment_args).last
@environment = nil unless can?(current_user, :read_environment, @environment)
@diff_notes_disabled = true

2
app/models/repository.rb
View file

@ -467,6 +467,8 @@ class Repository
unless Gitlab::Git.blank_ref?(sha)
Blob.decorate(Gitlab::Git::Blob.find(self, sha, path))
end
rescue Gitlab::Git::Repository::NoRepository
nil
end
def blob_by_oid(oid)

7
spec/features/projects/blobs/view_on_env_spec.rb
View file

@ -1,7 +0,0 @@
require 'spec_helper'
feature 'Blob' do
describe 'View on environment' do
# TODO: Test
end
end

9
spec/features/projects/commit/view_on_env_spec.rb
View file

@ -1,9 +0,0 @@
require 'spec_helper'
feature 'Commit' do
describe 'Diff' do
describe 'View on environment' do
# TODO: Test
end
end
end

9
spec/features/projects/compare/view_on_env_spec.rb
View file

@ -1,9 +0,0 @@
require 'spec_helper'
feature 'Compare' do
describe 'Diff' do
describe 'View on environment' do
# TODO: Test
end
end
end

9
spec/features/projects/merge_requests/view_on_env_spec.rb
View file

@ -1,9 +0,0 @@
require 'spec_helper'
feature 'Merge Request' do
describe 'Diff' do
describe 'View on environment' do
# TODO: Test
end
end
end

140
spec/features/projects/view_on_env_spec.rb Normal file
View file

@ -0,0 +1,140 @@
require 'spec_helper'
describe 'View on environment', js: true do
include WaitForAjax
let(:branch_name) { 'feature' }
let(:file_path) { 'files/ruby/feature.rb' }
let(:project) { create(:project) }
let(:user) { project.creator }
before do
project.team << [user, :master]
end
context 'when the branch has a route map' do
let(:route_map) do
<<-MAP.strip_heredoc
- source: /files/(.*)\\..*/
public: '\\1'
MAP
end
before do
Files::CreateService.new(
project,
user,
source_branch: branch_name,
target_branch: branch_name,
commit_message: "Add .gitlab/route-map.yml",
file_path: '.gitlab/route-map.yml',
file_content: route_map
).execute
# Update the file so that we still have a commit that will have a file on the environment
Files::UpdateService.new(
project,
user,
source_branch: branch_name,
target_branch: branch_name,
commit_message: "Update feature",
file_path: file_path,
file_content: "# Noop"
).execute
end
context 'and an active deployment' do
let(:sha) { project.commit(branch_name).sha }
let(:environment) { create(:environment, project: project, name: 'review/feature', external_url: 'http://feature.review.example.com') }
let!(:deployment) { create(:deployment, environment: environment, ref: branch_name, sha: sha) }
context 'when visiting the diff of a merge request for the branch' do
let(:merge_request) { create(:merge_request, :simple, source_project: project, source_branch: branch_name) }
before do
login_as(user)
visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request)
wait_for_ajax
end
it 'has a "View on env" button' do
within '.diffs' do
expect(page).to have_link('View on feature.review.example.com', href: 'http://feature.review.example.com/ruby/feature')
end
end
end
context 'when visiting a comparison for the branch' do
before do
login_as(user)
visit namespace_project_compare_path(project.namespace, project, from: 'master', to: branch_name)
wait_for_ajax
end
it 'has a "View on env" button' do
expect(page).to have_link('View on feature.review.example.com', href: 'http://feature.review.example.com/ruby/feature')
end
end
context 'when visiting a comparison for the commit' do
before do
login_as(user)
visit namespace_project_compare_path(project.namespace, project, from: 'master', to: sha)
wait_for_ajax
end
it 'has a "View on env" button' do
expect(page).to have_link('View on feature.review.example.com', href: 'http://feature.review.example.com/ruby/feature')
end
end
context 'when visiting a blob on the branch' do
before do
login_as(user)
visit namespace_project_blob_path(project.namespace, project, File.join(branch_name, file_path))
wait_for_ajax
end
it 'has a "View on env" button' do
expect(page).to have_link('View on feature.review.example.com', href: 'http://feature.review.example.com/ruby/feature')
end
end
context 'when visiting a blob on the commit' do
before do
login_as(user)
visit namespace_project_blob_path(project.namespace, project, File.join(sha, file_path))
wait_for_ajax
end
it 'has a "View on env" button' do
expect(page).to have_link('View on feature.review.example.com', href: 'http://feature.review.example.com/ruby/feature')
end
end
context 'when visiting the commit' do
before do
login_as(user)
visit namespace_project_commit_path(project.namespace, project, sha)
wait_for_ajax
end
it 'has a "View on env" button' do
expect(page).to have_link('View on feature.review.example.com', href: 'http://feature.review.example.com/ruby/feature')
end
end
end
end
end