scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-13 00:24:42 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix travis again

Browse source
This commit is contained in:
mlorb 2018-03-30 16:47:23 +02:00
parent 69b83a3f3d
commit 5f0d33d75e
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/constants.scss
View file

@ -1,4 +1,4 @@
@import url(https://fonts.googleapis.com/css?family=Open+Sans:400,600,700,400italic&subset=latin,latin-ext); // @import url(https://fonts.googleapis.com/css?family=Open+Sans:400,600,700,400italic&subset=latin,latin-ext);
//============================================================================== //==============================================================================
// Colors // Colors

10
features/step_definitions/users_steps.rb
View file

@ -19,8 +19,8 @@ end
Given(/^"([^"]*)" is signed in with "([^"]*)"$/) do |email, password| Given(/^"([^"]*)" is signed in with "([^"]*)"$/) do |email, password|
visit '/users/sign_in' visit '/users/sign_in'
fill_in '#user_email', with: email fill_in 'user_email', with: email
fill_in '#user_password', with: password fill_in 'user_password', with: password
click_button 'Log in' click_button 'Log in'
@current_user = User.find_by_email(email) @current_user = User.find_by_email(email)
end end
@ -35,7 +35,7 @@ end
Given("I click on Reset Password link in the reset password email for user {string}") do |email| Given("I click on Reset Password link in the reset password email for user {string}") do |email|
visit new_user_password_path visit new_user_password_path
fill_in '#user_email', with: email fill_in 'user_email', with: email
click_button 'Send me reset password instruction' click_button 'Send me reset password instruction'
Delayed::Worker.new.work_off Delayed::Worker.new.work_off
sleep 10 sleep 10
@ -52,6 +52,6 @@ Given(/^I am on Log in page$/) do
end end
Then(/^I fill in Email "([^"]*)" and Password "([^"]*)"$/) do |email, password| Then(/^I fill in Email "([^"]*)" and Password "([^"]*)"$/) do |email, password|
fill_in '#user_email', with: email fill_in 'user_email', with: email
fill_in '#user_password', with: password fill_in 'user_password', with: password
end end