diff options
Diffstat (limited to 'spec/features/projects/compare_spec.rb')
-rw-r--r-- | spec/features/projects/compare_spec.rb | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/spec/features/projects/compare_spec.rb b/spec/features/projects/compare_spec.rb index 5f7cf68987e..895a6c8aa55 100644 --- a/spec/features/projects/compare_spec.rb +++ b/spec/features/projects/compare_spec.rb @@ -29,52 +29,52 @@ describe "Compare", :js do click_button "Compare" expect(page).to have_content "Commits" - expect(page).to have_link 'Create merge request' + expect(page).to have_link "Create merge request" end - it 'renders additions info when click unfold diff' do + it "renders additions info when click unfold diff" do visit project_compare_index_path(project) - select_using_dropdown('from', RepoHelpers.sample_commit.parent_id, commit: true) - select_using_dropdown('to', RepoHelpers.sample_commit.id, commit: true) + select_using_dropdown("from", RepoHelpers.sample_commit.parent_id, commit: true) + select_using_dropdown("to", RepoHelpers.sample_commit.id, commit: true) - click_button 'Compare' - expect(page).to have_content 'Commits (1)' + click_button "Compare" + expect(page).to have_content "Commits (1)" expect(page).to have_content "Showing 2 changed files" - diff = first('.js-unfold') + diff = first(".js-unfold") diff.click wait_for_requests page.within diff.query_scope do - expect(first('.new_line').text).not_to have_content "..." + expect(first(".new_line").text).not_to have_content "..." end end - context 'when project have an open merge request' do + context "when project have an open merge request" do let!(:merge_request) do create( :merge_request, - title: 'Feature', + title: "Feature", source_project: project, - source_branch: 'feature', - target_branch: 'master', + source_branch: "feature", + target_branch: "master", author: project.users.first ) end - it 'compares branches' do + it "compares branches" do visit project_compare_index_path(project) - select_using_dropdown('from', 'master') - select_using_dropdown('to', 'feature') + select_using_dropdown("from", "master") + select_using_dropdown("to", "feature") - click_button 'Compare' + click_button "Compare" - expect(page).to have_content 'Commits (1)' - expect(page).to have_content 'Showing 1 changed file with 5 additions and 0 deletions' - expect(page).to have_link 'View open merge request', href: project_merge_request_path(project, merge_request) - expect(page).not_to have_link 'Create merge request' + expect(page).to have_content "Commits (1)" + expect(page).to have_content "Showing 1 changed file with 5 additions and 0 deletions" + expect(page).to have_link "View open merge request", href: project_merge_request_path(project, merge_request) + expect(page).not_to have_link "Create merge request" end end @@ -88,16 +88,16 @@ describe "Compare", :js do expect(find(".js-compare-from-dropdown .dropdown-content")).to have_selector("li", count: 3) end - context 'when commit has overflow', :js do - it 'displays warning' do + context "when commit has overflow", :js do + it "displays warning" do visit project_compare_index_path(project, from: "feature", to: "master") allow(Commit).to receive(:max_diff_options).and_return(max_files: 3) allow_any_instance_of(DiffHelper).to receive(:render_overflow_warning?).and_return(true) - click_button('Compare') + click_button("Compare") - page.within('.alert') do + page.within(".alert") do expect(page).to have_text("Too many changes to show. To preserve performance only 3 of 3+ files are displayed.") end end @@ -123,7 +123,7 @@ describe "Compare", :js do dropdown = find(".js-compare-#{dropdown_type}-dropdown") dropdown.find(".compare-dropdown-toggle").click # find input before using to wait for the inputs visiblity - dropdown.find('.dropdown-menu') + dropdown.find(".dropdown-menu") dropdown.fill_in("Filter by Git revision", with: selection) wait_for_requests |