From b53bd889d5407fb357329b414bcae929176c0690 Mon Sep 17 00:00:00 2001 From: ankonym Date: Wed, 7 Oct 2015 11:19:26 +0200 Subject: Change webapp tests to work with enabled invite codes This will generate an invite code so test_05_Can_create_and_authenticate_and_delete_user_via_API? will work correctly (when invite codes are required for signups). --- tests/helpers/bonafide_helper.rb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tests/helpers/bonafide_helper.rb b/tests/helpers/bonafide_helper.rb index 9b26eaaf..39f761fe 100644 --- a/tests/helpers/bonafide_helper.rb +++ b/tests/helpers/bonafide_helper.rb @@ -32,7 +32,11 @@ class LeapTest def assert_create_user user = SRP::User.new url = api_url("/1/users.json") - assert_post(url, user.to_params) do |body| + + params = user.to_params + params['user[invite_code]'] = generate_invite_code + + assert_post(url, params) do |body| assert response = JSON.parse(body), 'response should be JSON' assert response['ok'], "Creating a user should be successful, got #{response.inspect} instead." end @@ -40,6 +44,13 @@ class LeapTest return user end + def generate_invite_code + if property('webapp.invite_required') + `cd /srv/leap/webapp/ && sudo RAILS_ENV=production bundle exec rake generate_invites[1]`.gsub(/\n/, "") + end + end + + # # attempts to authenticate user. if successful, # user object is updated with id and session token. -- cgit v1.2.3 From dc426cc777aec921772c1d8c2fa014d61aa90d33 Mon Sep 17 00:00:00 2001 From: ankonym Date: Wed, 7 Oct 2015 12:11:21 +0200 Subject: Modify bonafide_helper to improve user creation test with invites Will now use the correct user to generate invite codes and only add invite code parameter when invite codes are enabled --- tests/helpers/bonafide_helper.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/helpers/bonafide_helper.rb b/tests/helpers/bonafide_helper.rb index 39f761fe..1a6dc6fe 100644 --- a/tests/helpers/bonafide_helper.rb +++ b/tests/helpers/bonafide_helper.rb @@ -34,7 +34,10 @@ class LeapTest url = api_url("/1/users.json") params = user.to_params - params['user[invite_code]'] = generate_invite_code + + if property('webapp.invite_required') + params['user[invite_code]'] = generate_invite_code + end assert_post(url, params) do |body| assert response = JSON.parse(body), 'response should be JSON' @@ -45,9 +48,7 @@ class LeapTest end def generate_invite_code - if property('webapp.invite_required') - `cd /srv/leap/webapp/ && sudo RAILS_ENV=production bundle exec rake generate_invites[1]`.gsub(/\n/, "") - end + `cd /srv/leap/webapp/ && sudo -u leap-webapp RAILS_ENV=production bundle exec rake generate_invites[1]`.gsub(/\n/, "") end -- cgit v1.2.3 From 2053883c81d261b5a9af5011bd6f0e8bc709f8d1 Mon Sep 17 00:00:00 2001 From: ankonym Date: Mon, 12 Oct 2015 11:19:21 +0200 Subject: Fix soledad test when invite codes are enabled This provides an invite code when invite codes are enabled while the test runs (but it does not get deleted yet afterwards) --- tests/helpers/bonafide_helper.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/helpers/bonafide_helper.rb b/tests/helpers/bonafide_helper.rb index 1a6dc6fe..82db3973 100644 --- a/tests/helpers/bonafide_helper.rb +++ b/tests/helpers/bonafide_helper.rb @@ -36,7 +36,8 @@ class LeapTest params = user.to_params if property('webapp.invite_required') - params['user[invite_code]'] = generate_invite_code + @invite_code = generate_invite_code + params['user[invite_code]'] = @invite_code end assert_post(url, params) do |body| -- cgit v1.2.3