From bcb3ebe373fc62e7047661851c63dbeab5d9f0c2 Mon Sep 17 00:00:00 2001 From: Manuel Date: Wed, 17 Jul 2024 16:07:17 +0200 Subject: [PATCH] Fix tests --- spec/features/activities_spec.rb | 2 + .../features/add_create_people_skills_spec.rb | 1 + spec/features/advanced_trainings_spec.rb | 2 + spec/features/auth_spec.rb | 2 + spec/features/core_competences_spec.rb | 1 + spec/features/cv_export_spec.rb | 1 + spec/features/cv_search_spec.rb | 1 + spec/features/edit_people_skills_spec.rb | 3 + spec/features/educations_spec.rb | 2 + spec/features/people_show_spec.rb | 1 + spec/features/people_spec.rb | 69 ++----------------- spec/support/people_skills_helper.rb | 1 + 12 files changed, 23 insertions(+), 63 deletions(-) diff --git a/spec/features/activities_spec.rb b/spec/features/activities_spec.rb index 56415ca3a..8441ecd0f 100644 --- a/spec/features/activities_spec.rb +++ b/spec/features/activities_spec.rb @@ -4,6 +4,8 @@ let(:person) { people(:bob) } before(:each) do + Capybara.page.driver.browser.manage.window.maximize + set_env_variables_and_stub_request sign_in auth_users(:admin) visit person_path(person) end diff --git a/spec/features/add_create_people_skills_spec.rb b/spec/features/add_create_people_skills_spec.rb index cd6ef498b..7ecd6fcf9 100644 --- a/spec/features/add_create_people_skills_spec.rb +++ b/spec/features/add_create_people_skills_spec.rb @@ -5,6 +5,7 @@ let(:person) { people(:bob) } before(:each) do + set_env_variables_and_stub_request sign_in auth_users(:user), scope: :auth_user visit person_people_skills_path(person) click_link text: "Skill hinzufügen" diff --git a/spec/features/advanced_trainings_spec.rb b/spec/features/advanced_trainings_spec.rb index 11ed6981d..8bf641ca4 100644 --- a/spec/features/advanced_trainings_spec.rb +++ b/spec/features/advanced_trainings_spec.rb @@ -4,6 +4,8 @@ let(:person) { people(:bob) } before(:each) do + Capybara.page.driver.browser.manage.window.maximize + set_env_variables_and_stub_request sign_in auth_users(:admin) visit person_path(person) end diff --git a/spec/features/auth_spec.rb b/spec/features/auth_spec.rb index 5f7124d2e..e119750ee 100644 --- a/spec/features/auth_spec.rb +++ b/spec/features/auth_spec.rb @@ -4,6 +4,7 @@ context 'Check user privileges' do before(:each) do + set_env_variables_and_stub_request sign_in auth_users(:user), scope: :auth_user visit root_path end @@ -23,6 +24,7 @@ context 'Check admin privileges' do before(:each) do + set_env_variables_and_stub_request sign_in(auth_users(:admin)) visit visit people_path end diff --git a/spec/features/core_competences_spec.rb b/spec/features/core_competences_spec.rb index a094c6a63..c2148cb0b 100644 --- a/spec/features/core_competences_spec.rb +++ b/spec/features/core_competences_spec.rb @@ -2,6 +2,7 @@ describe "Core competences" do before(:each) do + set_env_variables_and_stub_request sign_in auth_users(:user), scope: :auth_user visit root_path end diff --git a/spec/features/cv_export_spec.rb b/spec/features/cv_export_spec.rb index d6febe027..08fedf9e8 100644 --- a/spec/features/cv_export_spec.rb +++ b/spec/features/cv_export_spec.rb @@ -2,6 +2,7 @@ describe :people do before(:each) do + set_env_variables_and_stub_request sign_in auth_users(:user), scope: :auth_user visit root_path end diff --git a/spec/features/cv_search_spec.rb b/spec/features/cv_search_spec.rb index d44ed7908..a56e88d4a 100644 --- a/spec/features/cv_search_spec.rb +++ b/spec/features/cv_search_spec.rb @@ -5,6 +5,7 @@ let(:person) { people(:bob) } before(:each) do + set_env_variables_and_stub_request sign_in auth_users(:admin) visit("/cv_search") end diff --git a/spec/features/edit_people_skills_spec.rb b/spec/features/edit_people_skills_spec.rb index 13a30b28d..2ec46e013 100644 --- a/spec/features/edit_people_skills_spec.rb +++ b/spec/features/edit_people_skills_spec.rb @@ -5,6 +5,7 @@ let(:person) { people(:bob) } before(:each) do + set_env_variables_and_stub_request sign_in auth_users(:user), scope: :auth_user end @@ -119,6 +120,8 @@ def not_rated_default_skills(person) let(:bob) { people(:bob) } before(:each) do + Capybara.page.driver.browser.manage.window.maximize + set_env_variables_and_stub_request sign_in auth_users(:user), scope: :auth_user visit person_people_skills_path(bob, rating: 1) end diff --git a/spec/features/educations_spec.rb b/spec/features/educations_spec.rb index 9eea45190..de747f570 100644 --- a/spec/features/educations_spec.rb +++ b/spec/features/educations_spec.rb @@ -4,6 +4,8 @@ let(:person) { people(:bob) } before(:each) do + Capybara.page.driver.browser.manage.window.maximize + set_env_variables_and_stub_request sign_in auth_users(:admin) visit person_path(person) end diff --git a/spec/features/people_show_spec.rb b/spec/features/people_show_spec.rb index a3304fed8..a548cb311 100644 --- a/spec/features/people_show_spec.rb +++ b/spec/features/people_show_spec.rb @@ -2,6 +2,7 @@ describe 'People skills Show', type: :feature, js: true do before(:each) do + set_env_variables_and_stub_request sign_in auth_users(:user), scope: :auth_user visit root_path end diff --git a/spec/features/people_spec.rb b/spec/features/people_spec.rb index b9d022776..67e16ea95 100644 --- a/spec/features/people_spec.rb +++ b/spec/features/people_spec.rb @@ -1,69 +1,11 @@ require 'rails_helper' -ptime_base_test_url = "www.ptime.example.com" -ptime_api_test_username = "test username" -ptime_api_test_password = "test password" -ENV["PTIME_BASE_URL"] = ptime_base_test_url -ENV["PTIME_API_USERNAME"] = ptime_api_test_username -ENV["PTIME_API_PASSWORD"] = ptime_api_test_password - describe :people do describe 'People Search', type: :feature, js: true do - employees_json = { - 'data' => [ - { - 'id' => 33, - 'type' => 'employee', - 'attributes' => { - 'shortname' => 'LSM', - 'firstname' => 'Longmax', - 'lastname' => 'Smith', - 'email' => 'longmax@example.com', - 'marital_status' => 'single', - 'nationalities' => ['ZW'], - 'graduation' => 'BSc in Architecture', - 'department_shortname' => 'SYS', - 'employment_roles' => [] - } - }, - { - 'id' => 21, - 'type' => 'employee', - 'attributes' => { - 'shortname' => 'AMA', - 'firstname' => 'Alice', - 'lastname' => 'Mante', - 'full_name' => 'Alice Mante', - 'email' => 'alice@example.com', - 'marital_status' => 'single', - 'nationalities' => ['AU'], - 'graduation' => 'MSc in writing', - 'department_shortname' => 'SYS', - 'employment_roles' => [], - 'is_employed' => false, - 'birthdate' => '01.04.2001', - 'location' => 'Bern' - } - }, - { - 'id' => 45, - 'type' => 'employee', - 'attributes' => { - 'shortname' => 'CFO', - 'firstname' => 'Charlie', - 'lastname' => 'Ford', - 'email' => 'charlie@example.com', - 'marital_status' => 'married', - 'nationalities' => ['GB'], - 'graduation' => 'MSc in networking', - 'department_shortname' => 'SYS', - 'employment_roles' => [] - } - } - ] - }.to_json before(:each) do + set_env_variables_and_stub_request + ENV['LAST_PTIME_API_REQUEST'] = DateTime.current.to_s sign_in auth_users(:user), scope: :auth_user end @@ -114,9 +56,6 @@ alice = people(:alice) alice.ptime_employee_id = 21 alice.save! - stub_request(:get, "http://#{ptime_base_test_url}/api/v1/employees?per_page=1000"). - to_return(body: employees_json, headers: { 'content-type': "application/vnd.api+json; charset=utf-8" }, status: 200) - .with(basic_auth: [ptime_api_test_username, ptime_api_test_password]) visit people_path select_from_slim_select("#person_id_person", alice.name) expect(page).to have_current_path(person_path(alice)) @@ -265,6 +204,8 @@ def add_language(language) describe 'Edit person', type: :feature, js: true do before(:each) do + Capybara.page.driver.browser.manage.window.maximize + set_env_variables_and_stub_request sign_in auth_users(:user), scope: :auth_user end @@ -349,6 +290,7 @@ def add_language(language) describe 'Create person', type: :feature, js: true do before(:each) do + set_env_variables_and_stub_request sign_in auth_users(:user), scope: :auth_user end @@ -382,6 +324,7 @@ def add_language(language) let(:longmax) { people(:longmax) } before(:each) do + set_env_variables_and_stub_request sign_in auth_users(:user), scope: :auth_user end diff --git a/spec/support/people_skills_helper.rb b/spec/support/people_skills_helper.rb index 46e72bc35..b431e392f 100644 --- a/spec/support/people_skills_helper.rb +++ b/spec/support/people_skills_helper.rb @@ -44,6 +44,7 @@ def validate_skill_level_label(level) end def validate_interest(interest) + require "pry"; binding.pry star_labels = page.find_all("label[id^='star']", visible: false).to_a.reverse star_labels.each_with_index do |label, index| body = page.document.find('body')