From 545b53a02efab9f45ffbcba91d62bd2b4287bdf7 Mon Sep 17 00:00:00 2001 From: Olena Kanevska Date: Tue, 6 Nov 2018 12:12:36 +0200 Subject: [PATCH 1/2] fixed page validation --- pages/user_view_page.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/user_view_page.rb b/pages/user_view_page.rb index 50dae8e..7a6a037 100644 --- a/pages/user_view_page.rb +++ b/pages/user_view_page.rb @@ -1,5 +1,5 @@ require_relative 'demo_app_page' class UserViewPage < DemoAppPage path '/users/{/id}' - validate :url, %r{\/users\/\d+\z} + validate :url, %r{/users/\d+\z} end From fef52ceabdf0c6545de7afcab9fbaae3e2a45f98 Mon Sep 17 00:00:00 2001 From: Olena Kanevska Date: Tue, 6 Nov 2018 12:22:02 +0200 Subject: [PATCH 2/2] fixed page validation --- pages/article_page.rb | 2 +- pages/change_password_page.rb | 2 +- pages/confirmation_email_page.rb | 2 +- pages/forgot_password_page.rb | 2 +- pages/home_page.rb | 2 +- pages/login_page.rb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pages/article_page.rb b/pages/article_page.rb index 83378bc..a415a75 100644 --- a/pages/article_page.rb +++ b/pages/article_page.rb @@ -1,7 +1,7 @@ require_relative 'demo_app_page' class ArticlePage < DemoAppPage path '/articles{/id}' - validate :url, %r{\/articles\/\d+\/?\z} + validate :url, %r{/articles/\d+/?\z} element :comment_field, :fillable_field, 'comment_body' element :add_comment_button, :button, 'Create comment' diff --git a/pages/change_password_page.rb b/pages/change_password_page.rb index d58419a..6e36798 100644 --- a/pages/change_password_page.rb +++ b/pages/change_password_page.rb @@ -1,7 +1,7 @@ require_relative 'demo_app_page' class ChangePasswordPage < DemoAppPage path '/users/password/edit?reset_password_token={token}' - validate :url, %r{\/users\/password(?:\z|\/edit)} + validate :url, %r{/users/password(?:\z|/edit)} element :password_input, :fillable_field, 'user_password' element :confirm_password_input, :fillable_field, 'user_password_confirmation' diff --git a/pages/confirmation_email_page.rb b/pages/confirmation_email_page.rb index 71dc276..07aa60b 100644 --- a/pages/confirmation_email_page.rb +++ b/pages/confirmation_email_page.rb @@ -1,5 +1,5 @@ require_relative 'demo_app_page' class ConfirmationEmailPage < DemoAppPage path '/users/confirmation?confirmation_token={token}' - validate :url, %r{\/users\/confirmation} + validate :url, %r{/users/confirmation} end diff --git a/pages/forgot_password_page.rb b/pages/forgot_password_page.rb index 0359987..1959306 100644 --- a/pages/forgot_password_page.rb +++ b/pages/forgot_password_page.rb @@ -1,7 +1,7 @@ require_relative 'demo_app_page' class ForgotPasswordPage < DemoAppPage path '/users/password/new' - validate :url, %r{\/users\/password} + validate :url, %r{/users/password} validate :title, /Demo web application - Forgot your password\?/ element :email_input, :fillable_field, 'user_email' diff --git a/pages/home_page.rb b/pages/home_page.rb index 6de9469..c48bd9f 100644 --- a/pages/home_page.rb +++ b/pages/home_page.rb @@ -3,7 +3,7 @@ class HomePage < DemoAppPage path '/' validate :title, /\ADemo web application - Home\z/ - validate :url, %r{\A(?:.*?:\/\/)?[^\/]*\/?\z} + validate :url, %r{\A(?:.*?://)?[^/]*/?\z} element :article_link, :xpath, ->(title) { ".//a[.='#{title}']" } element :article_group, :xpath, ->(number) { "(//*[@class=\"article__group_title\"])[#{number}]" } diff --git a/pages/login_page.rb b/pages/login_page.rb index a3cbf5a..2aebca4 100644 --- a/pages/login_page.rb +++ b/pages/login_page.rb @@ -3,7 +3,7 @@ class LoginPage < DemoAppPage path '/users/sign_in' validate :title, /\ADemo web application - Login form\z/ # Demo web application - Login form - validate :url, %r{\/sign_in\/?\z} + validate :url, %r{/sign_in/?\z} element :email_input, :fillable_field, 'user_email' element :password_input, :fillable_field, 'user_password'