diff options
author | Robert Speicher <rspeicher@gmail.com> | 2015-08-30 18:29:28 -0400 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2015-08-30 18:32:58 -0400 |
commit | 98329c93dc93cbe849578d425a31749942f8f8c1 (patch) | |
tree | 9dc87d9fe060d80b2bab0030b5d05fd977fd7578 | |
parent | 111fdd25e4255be40aee958703e313d7caad86c6 (diff) | |
download | gitlab-ci-98329c93dc93cbe849578d425a31749942f8f8c1.tar.gz |
`page.should[_not]` -> `expect(page).[not_]to`
-rw-r--r-- | spec/features/admin/builds_spec.rb | 22 | ||||
-rw-r--r-- | spec/features/admin/events_spec.rb | 4 | ||||
-rw-r--r-- | spec/features/admin/projects_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/admin/runners_spec.rb | 12 | ||||
-rw-r--r-- | spec/features/builds_spec.rb | 16 | ||||
-rw-r--r-- | spec/features/commits_spec.rb | 18 | ||||
-rw-r--r-- | spec/features/events_spec.rb | 4 | ||||
-rw-r--r-- | spec/features/lint_spec.rb | 12 | ||||
-rw-r--r-- | spec/features/projects_spec.rb | 24 | ||||
-rw-r--r-- | spec/features/runners_spec.rb | 12 | ||||
-rw-r--r-- | spec/features/triggers_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/variables_spec.rb | 2 |
12 files changed, 65 insertions, 65 deletions
diff --git a/spec/features/admin/builds_spec.rb b/spec/features/admin/builds_spec.rb index e62e836..de928a9 100644 --- a/spec/features/admin/builds_spec.rb +++ b/spec/features/admin/builds_spec.rb @@ -16,8 +16,8 @@ describe "Admin Builds" do visit admin_builds_path end - it { page.should have_content "All builds" } - it { page.should have_content build.short_sha } + it { expect(page).to have_content "All builds" } + it { expect(page).to have_content build.short_sha } end describe "Tabs" do @@ -29,7 +29,7 @@ describe "Admin Builds" do visit admin_builds_path - page.all(".build-link").size.should == 4 + expect(page.all(".build-link").size).to eq 4 end it "shows pending builds" do @@ -44,10 +44,10 @@ describe "Admin Builds" do click_on "Pending" end - page.find(".build-link").should have_content(build.id) - page.find(".build-link").should_not have_content(build1.id) - page.find(".build-link").should_not have_content(build2.id) - page.find(".build-link").should_not have_content(build3.id) + expect(page.find(".build-link")).to have_content(build.id) + expect(page.find(".build-link")).not_to have_content(build1.id) + expect(page.find(".build-link")).not_to have_content(build2.id) + expect(page.find(".build-link")).not_to have_content(build3.id) end it "shows running builds" do @@ -62,10 +62,10 @@ describe "Admin Builds" do click_on "Running" end - page.find(".build-link").should have_content(build1.id) - page.find(".build-link").should_not have_content(build.id) - page.find(".build-link").should_not have_content(build2.id) - page.find(".build-link").should_not have_content(build3.id) + expect(page.find(".build-link")).to have_content(build1.id) + expect(page.find(".build-link")).not_to have_content(build.id) + expect(page.find(".build-link")).not_to have_content(build2.id) + expect(page.find(".build-link")).not_to have_content(build3.id) end end end diff --git a/spec/features/admin/events_spec.rb b/spec/features/admin/events_spec.rb index 469c6ed..4f5dbd9 100644 --- a/spec/features/admin/events_spec.rb +++ b/spec/features/admin/events_spec.rb @@ -14,7 +14,7 @@ describe "Admin Events" do visit admin_events_path end - it { page.should have_content "Events" } - it { page.should have_content event.description } + it { expect(page).to have_content "Events" } + it { expect(page).to have_content event.description } end end diff --git a/spec/features/admin/projects_spec.rb b/spec/features/admin/projects_spec.rb index 6f87e36..9113300 100644 --- a/spec/features/admin/projects_spec.rb +++ b/spec/features/admin/projects_spec.rb @@ -14,6 +14,6 @@ describe "Admin Projects" do visit admin_projects_path end - it { page.should have_content "Projects" } + it { expect(page).to have_content "Projects" } end end diff --git a/spec/features/admin/runners_spec.rb b/spec/features/admin/runners_spec.rb index 2827a7f..281521a 100644 --- a/spec/features/admin/runners_spec.rb +++ b/spec/features/admin/runners_spec.rb @@ -27,8 +27,8 @@ describe "Admin Runners" do click_button 'Search' end - it { page.should have_content("foo") } - it { page.should_not have_content("bar") } + it { expect(page).to have_content("foo") } + it { expect(page).not_to have_content("bar") } end end @@ -46,8 +46,8 @@ describe "Admin Runners" do end describe 'projects' do - it { page.should have_content("foo") } - it { page.should have_content("bar") } + it { expect(page).to have_content("foo") } + it { expect(page).to have_content("bar") } end describe 'search' do @@ -56,8 +56,8 @@ describe "Admin Runners" do click_button 'Search' end - it { page.should have_content("foo") } - it { page.should_not have_content("bar") } + it { expect(page).to have_content("foo") } + it { expect(page).not_to have_content("bar") } end end end diff --git a/spec/features/builds_spec.rb b/spec/features/builds_spec.rb index fcd7996..ddfc579 100644 --- a/spec/features/builds_spec.rb +++ b/spec/features/builds_spec.rb @@ -13,9 +13,9 @@ describe "Builds" do visit project_build_path(@project, @build) end - it { page.should have_content @commit.sha[0..7] } - it { page.should have_content @commit.git_commit_message } - it { page.should have_content @commit.git_author_name } + it { expect(page).to have_content @commit.sha[0..7] } + it { expect(page).to have_content @commit.git_commit_message } + it { expect(page).to have_content @commit.git_author_name } end describe "GET /:project/builds/:id/cancel" do @@ -25,8 +25,8 @@ describe "Builds" do visit cancel_project_build_path(@project, @build) end - it { page.should have_content 'canceled' } - it { page.should have_content 'Retry' } + it { expect(page).to have_content 'canceled' } + it { expect(page).to have_content 'Retry' } end describe "POST /:project/builds/:id/retry" do @@ -37,8 +37,8 @@ describe "Builds" do click_link 'Retry' end - it { page.should have_content 'pending' } - it { page.should have_content 'Cancel' } + it { expect(page).to have_content 'pending' } + it { expect(page).to have_content 'Cancel' } end describe "Show page public accessible" do @@ -52,6 +52,6 @@ describe "Builds" do visit project_build_path(@project, @build) end - it { page.should have_content @commit.sha[0..7] } + it { expect(page).to have_content @commit.sha[0..7] } end end diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb index 202f05c..603e3b7 100644 --- a/spec/features/commits_spec.rb +++ b/spec/features/commits_spec.rb @@ -14,9 +14,9 @@ describe "Commits" do visit project_ref_commit_path(@project, @commit.ref, @commit.sha) end - it { page.should have_content @commit.sha[0..7] } - it { page.should have_content @commit.git_commit_message } - it { page.should have_content @commit.git_author_name } + it { expect(page).to have_content @commit.sha[0..7] } + it { expect(page).to have_content @commit.git_commit_message } + it { expect(page).to have_content @commit.git_author_name } end describe "Cancel commit" do @@ -24,7 +24,7 @@ describe "Commits" do visit project_ref_commit_path(@project, @commit.ref, @commit.sha) click_on "Cancel" - page.should have_content "canceled" + expect(page).to have_content "canceled" end end @@ -32,7 +32,7 @@ describe "Commits" do it "does not show warning" do visit project_ref_commit_path(@project, @commit.ref, @commit.sha) - page.should_not have_content ".gitlab-ci.yml not found in this commit" + expect(page).not_to have_content ".gitlab-ci.yml not found in this commit" end it "shows warning" do @@ -41,7 +41,7 @@ describe "Commits" do visit project_ref_commit_path(@project, @commit.ref, @commit.sha) - page.should have_content ".gitlab-ci.yml not found in this commit" + expect(page).to have_content ".gitlab-ci.yml not found in this commit" end end end @@ -58,9 +58,9 @@ describe "Commits" do visit project_ref_commit_path(@project, @commit.ref, @commit.sha) end - it { page.should have_content @commit.sha[0..7] } - it { page.should have_content @commit.git_commit_message } - it { page.should have_content @commit.git_author_name } + it { expect(page).to have_content @commit.sha[0..7] } + it { expect(page).to have_content @commit.git_commit_message } + it { expect(page).to have_content @commit.git_author_name } end end end diff --git a/spec/features/events_spec.rb b/spec/features/events_spec.rb index 77d1fba..d1bcf49 100644 --- a/spec/features/events_spec.rb +++ b/spec/features/events_spec.rb @@ -14,7 +14,7 @@ describe "Events" do visit project_events_path(project) end - it { page.should have_content "Events" } - it { page.should have_content event.description } + it { expect(page).to have_content "Events" } + it { expect(page).to have_content event.description } end end diff --git a/spec/features/lint_spec.rb b/spec/features/lint_spec.rb index 0b3d4e0..820ed5b 100644 --- a/spec/features/lint_spec.rb +++ b/spec/features/lint_spec.rb @@ -11,10 +11,10 @@ describe "Lint" do fill_in "content", with: content click_on "Validate" within "table" do - page.should have_content("Job - rspec") - page.should have_content("Job - spinach") - page.should have_content("Deploy Job - staging") - page.should have_content("Deploy Job - production") + expect(page).to have_content("Job - rspec") + expect(page).to have_content("Job - spinach") + expect(page).to have_content("Deploy Job - staging") + expect(page).to have_content("Deploy Job - production") end end @@ -22,7 +22,7 @@ describe "Lint" do visit lint_path fill_in "content", with: "" click_on "Validate" - page.should have_content("Status: syntax is incorrect") - page.should have_content("Error: Please provide content of .gitlab-ci.yml") + expect(page).to have_content("Status: syntax is incorrect") + expect(page).to have_content("Error: Please provide content of .gitlab-ci.yml") end end diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb index 3f21af9..c7f9b4b 100644 --- a/spec/features/projects_spec.rb +++ b/spec/features/projects_spec.rb @@ -12,8 +12,8 @@ describe "Projects" do visit projects_path end - it { page.should have_content "GitLab / gitlab-shell" } - it { page.should have_selector ".search input#search" } + it { expect(page).to have_content "GitLab / gitlab-shell" } + it { expect(page).to have_selector ".search input#search" } end describe "GET /projects/:id" do @@ -21,8 +21,8 @@ describe "Projects" do visit project_path(@project) end - it { page.should have_content @project.name } - it { page.should have_content 'All commits' } + it { expect(page).to have_content @project.name } + it { expect(page).to have_content 'All commits' } end describe "GET /projects/:id/edit" do @@ -30,14 +30,14 @@ describe "Projects" do visit edit_project_path(@project) end - it { page.should have_content @project.name } - it { page.should have_content 'Build Schedule' } + it { expect(page).to have_content @project.name } + it { expect(page).to have_content 'Build Schedule' } it "updates configuration" do fill_in 'Timeout', with: '70' click_button 'Save changes' - page.should have_content 'was successfully updated' + expect(page).to have_content 'was successfully updated' find_field('Timeout').value.should eq '70' end @@ -48,10 +48,10 @@ describe "Projects" do visit project_charts_path(@project) end - it { page.should have_content 'Overall' } - it { page.should have_content 'Builds chart for last week' } - it { page.should have_content 'Builds chart for last month' } - it { page.should have_content 'Builds chart for last year' } - it { page.should have_content 'Commit duration in minutes for last 30 commits' } + it { expect(page).to have_content 'Overall' } + it { expect(page).to have_content 'Builds chart for last week' } + it { expect(page).to have_content 'Builds chart for last month' } + it { expect(page).to have_content 'Builds chart for last year' } + it { expect(page).to have_content 'Commit duration in minutes for last 30 commits' } end end diff --git a/spec/features/runners_spec.rb b/spec/features/runners_spec.rb index fc78c0e..6f9f9ac 100644 --- a/spec/features/runners_spec.rb +++ b/spec/features/runners_spec.rb @@ -26,9 +26,9 @@ describe "Runners" do it "places runners in right places" do visit project_runners_path(@project) - page.find(".available-specific-runners").should have_content(@specific_runner2.display_name) - page.find(".activated-specific-runners").should have_content(@specific_runner.display_name) - page.find(".available-shared-runners").should have_content(@shared_runner.display_name) + expect(page.find(".available-specific-runners")).to have_content(@specific_runner2.display_name) + expect(page.find(".activated-specific-runners")).to have_content(@specific_runner.display_name) + expect(page.find(".available-shared-runners")).to have_content(@shared_runner.display_name) end it "enables specific runner for project" do @@ -38,7 +38,7 @@ describe "Runners" do click_on "Enable for this project" end - page.find(".activated-specific-runners").should have_content(@specific_runner2.display_name) + expect(page.find(".activated-specific-runners")).to have_content(@specific_runner2.display_name) end it "disables specific runner for project" do @@ -50,7 +50,7 @@ describe "Runners" do click_on "Disable for this project" end - page.find(".available-specific-runners").should have_content(@specific_runner.display_name) + expect(page.find(".available-specific-runners")).to have_content(@specific_runner.display_name) end it "removes specific runner for project if this is last project for that runners" do @@ -92,7 +92,7 @@ describe "Runners" do click_on @specific_runner.short_sha - page.should have_content(@specific_runner.platform) + expect(page).to have_content(@specific_runner.platform) end end end diff --git a/spec/features/triggers_spec.rb b/spec/features/triggers_spec.rb index 2076429..1ec43f9 100644 --- a/spec/features/triggers_spec.rb +++ b/spec/features/triggers_spec.rb @@ -15,7 +15,7 @@ describe 'Variables' do end it 'contains trigger token' do - page.should have_content(@project.triggers.first.token) + expect(page).to have_content(@project.triggers.first.token) end it 'revokes the trigger' do diff --git a/spec/features/variables_spec.rb b/spec/features/variables_spec.rb index 2bb0d9d..71c08ef 100644 --- a/spec/features/variables_spec.rb +++ b/spec/features/variables_spec.rb @@ -18,7 +18,7 @@ describe "Variables" do fill_in "Value", with: "SECRET_VALUE" click_on "Save changes" - page.should have_content("Variables were successfully updated.") + expect(page).to have_content("Variables were successfully updated.") @project.variables.count.should == 1 end |