diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 09:16:11 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 09:16:11 +0000 |
commit | edaa33dee2ff2f7ea3fac488d41558eb5f86d68c (patch) | |
tree | 11f143effbfeba52329fb7afbd05e6e2a3790241 /spec/features/projects/files | |
parent | d8a5691316400a0f7ec4f83832698f1988eb27c1 (diff) | |
download | gitlab-ce-edaa33dee2ff2f7ea3fac488d41558eb5f86d68c.tar.gz |
Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42
Diffstat (limited to 'spec/features/projects/files')
5 files changed, 11 insertions, 7 deletions
diff --git a/spec/features/projects/files/user_browses_files_spec.rb b/spec/features/projects/files/user_browses_files_spec.rb index 4e9e129042c..508dec70db6 100644 --- a/spec/features/projects/files/user_browses_files_spec.rb +++ b/spec/features/projects/files/user_browses_files_spec.rb @@ -340,6 +340,7 @@ RSpec.describe "User browses files" do let(:newrev) { project.repository.commit('master').sha } before do + stub_feature_flags(refactor_blob_viewer: false) # This stub will be removed in https://gitlab.com/gitlab-org/gitlab/-/issues/350456 create_file_in_repo(project, 'master', 'master', filename, 'Test file') path = File.join('master', filename) @@ -355,6 +356,7 @@ RSpec.describe "User browses files" do context "when browsing a raw file" do before do + stub_feature_flags(refactor_blob_viewer: false) # This stub will be removed in https://gitlab.com/gitlab-org/gitlab/-/issues/350456 path = File.join(RepoHelpers.sample_commit.id, RepoHelpers.sample_blob.path) visit(project_blob_path(project, path)) diff --git a/spec/features/projects/files/user_browses_lfs_files_spec.rb b/spec/features/projects/files/user_browses_lfs_files_spec.rb index 3be5ab64834..17699847704 100644 --- a/spec/features/projects/files/user_browses_lfs_files_spec.rb +++ b/spec/features/projects/files/user_browses_lfs_files_spec.rb @@ -35,7 +35,7 @@ RSpec.describe 'Projects > Files > User browses LFS files' do expect(page).to have_content 'version https://git-lfs.github.com/spec/v1' expect(page).to have_content 'oid sha256:91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897' expect(page).to have_content 'size 1575078' - expect(page).not_to have_content 'Download (1.5 MB)' + expect(page).not_to have_content 'Download (1.50 MiB)' end end @@ -56,7 +56,7 @@ RSpec.describe 'Projects > Files > User browses LFS files' do click_link('lfs') click_link('lfs_object.iso') - expect(page).to have_content('Download (1.5 MB)') + expect(page).to have_content('Download (1.50 MiB)') expect(page).not_to have_content('version https://git-lfs.github.com/spec/v1') expect(page).not_to have_content('oid sha256:91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897') expect(page).not_to have_content('size 1575078') @@ -88,7 +88,7 @@ RSpec.describe 'Projects > Files > User browses LFS files' do it 'does not show single file edit link' do page.within('.content') do expect(page).to have_selector(:link_or_button, 'Web IDE') - expect(page).not_to have_selector(:link_or_button, 'Edit') + expect(page).not_to have_css('button[data-testid="edit"') end end end diff --git a/spec/features/projects/files/user_deletes_files_spec.rb b/spec/features/projects/files/user_deletes_files_spec.rb index b6e300e9e59..c508b2ddba9 100644 --- a/spec/features/projects/files/user_deletes_files_spec.rb +++ b/spec/features/projects/files/user_deletes_files_spec.rb @@ -15,6 +15,7 @@ RSpec.describe 'Projects > Files > User deletes files', :js do let(:user) { create(:user) } before do + stub_feature_flags(refactor_blob_viewer: false) # This stub will be removed in https://gitlab.com/gitlab-org/gitlab/-/issues/349953 sign_in(user) end diff --git a/spec/features/projects/files/user_edits_files_spec.rb b/spec/features/projects/files/user_edits_files_spec.rb index 453cc14c267..2b4ac3dc1d8 100644 --- a/spec/features/projects/files/user_edits_files_spec.rb +++ b/spec/features/projects/files/user_edits_files_spec.rb @@ -150,7 +150,7 @@ RSpec.describe 'Projects > Files > User edits files', :js do expect_fork_prompt - click_link_or_button('Fork project') + click_link_or_button('Fork') expect_fork_status @@ -169,7 +169,7 @@ RSpec.describe 'Projects > Files > User edits files', :js do expect_fork_prompt - click_link_or_button('Fork project') + click_link_or_button('Fork') expect_fork_status @@ -183,7 +183,7 @@ RSpec.describe 'Projects > Files > User edits files', :js do click_link_or_button('Edit') expect_fork_prompt - click_link_or_button('Fork project') + click_link_or_button('Fork') find('.file-editor', match: :first) @@ -214,7 +214,7 @@ RSpec.describe 'Projects > Files > User edits files', :js do click_link('.gitignore') click_link_or_button('Edit') - expect(page).not_to have_link('Fork project') + expect(page).not_to have_link('Fork') find('#editor') set_editor_value('*.rbca') diff --git a/spec/features/projects/files/user_replaces_files_spec.rb b/spec/features/projects/files/user_replaces_files_spec.rb index c9b472260bd..fe9520fffc8 100644 --- a/spec/features/projects/files/user_replaces_files_spec.rb +++ b/spec/features/projects/files/user_replaces_files_spec.rb @@ -17,6 +17,7 @@ RSpec.describe 'Projects > Files > User replaces files', :js do let(:user) { create(:user) } before do + stub_feature_flags(refactor_blob_viewer: false) # This stub will be removed in https://gitlab.com/gitlab-org/gitlab/-/issues/349953 sign_in(user) end |