From 876651009e3fc98fd44b03923b04f6af9ea8fab9 Mon Sep 17 00:00:00 2001 From: JonahStanley Date: Fri, 9 Aug 2013 11:01:44 -0400 Subject: [PATCH] Logging out no longer uses cookies. Removed other cookie reference --- cms/djangoapps/contentstore/features/course-team.py | 3 ++- common/djangoapps/terrain/browser.py | 2 +- common/djangoapps/terrain/steps.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cms/djangoapps/contentstore/features/course-team.py b/cms/djangoapps/contentstore/features/course-team.py index db7b4d81f9..ab68050866 100644 --- a/cms/djangoapps/contentstore/features/course-team.py +++ b/cms/djangoapps/contentstore/features/course-team.py @@ -2,6 +2,7 @@ #pylint: disable=W0621 from lettuce import world, step +from lettuce.django import django_url from common import create_studio_user from django.contrib.auth.models import Group from auth.authz import get_course_groupname_for_role, get_user_by_email @@ -91,7 +92,7 @@ def remove_course_team_admin(_step, outer_capture, name): @step(u'"([^"]*)" logs in$') def other_user_login(_step, name): - world.browser.cookies.delete() + world.visit(django_url('logout')) world.visit('/') signin_css = 'a.action-signin' diff --git a/common/djangoapps/terrain/browser.py b/common/djangoapps/terrain/browser.py index 69c970fc15..680885fec4 100644 --- a/common/djangoapps/terrain/browser.py +++ b/common/djangoapps/terrain/browser.py @@ -83,7 +83,7 @@ def initial_setup(server): """ Launch the browser once before executing the tests. """ - #browser_driver = getattr(settings, 'LETTUCE_BROWSER', 'chrome') + # browser_driver = getattr(settings, 'LETTUCE_BROWSER', 'chrome') # There is an issue with ChromeDriver2 r195627 on Ubuntu # in which we sometimes get an invalid browser session. diff --git a/common/djangoapps/terrain/steps.py b/common/djangoapps/terrain/steps.py index 9cf2aeda49..6e11ed19ea 100644 --- a/common/djangoapps/terrain/steps.py +++ b/common/djangoapps/terrain/steps.py @@ -99,7 +99,7 @@ def i_am_logged_in_user(step): @step('I am not logged in$') def i_am_not_logged_in(step): - world.browser.cookies.delete() + world.visit(django_url('logout')) @step('I am staff for course "([^"]*)"$') @@ -150,7 +150,7 @@ def i_am_logged_in(step): world.log_in(username='robot', password='test') world.browser.visit(django_url('/')) # You should not see the login link - assert_equals(world.browser.find_by_css('a#login'), []) + world.is_css_not_present('a#login') @step(u'I am an edX user$')