From ee3b4a2a081557f510674df489ac7479e31f5e82 Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Wed, 1 Mar 2017 17:43:38 +0530
Subject: Fix selenium tests: - Fix addition of answer to codemirror using
 selenium - Add custom exception when selenium fails - Add id to logout button
 on student interface - Fix imports for Python3 support in load_test.py

---
 .travis.yml                              |  2 +-
 setup.py                                 |  1 +
 yaksh/live_server_tests/load_test.py     | 34 +++++++++++++++++---------------
 yaksh/live_server_tests/selenium_test.py | 16 ++++++++++-----
 yaksh/templates/user.html                |  2 +-
 yaksh/templates/yaksh/question.html      | 15 +++++++-------
 6 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5b8ff2f..da71f7a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,4 +22,4 @@ before_install:
 # command to run tests
 script:
   - python manage.py test -v 2 yaksh
-  - python manage.py test -v 2 yaksh.live_server_tests
+  - python manage.py test -v 2 yaksh.live_server_tests.load_test
diff --git a/setup.py b/setup.py
index 37ed948..b4b3015 100644
--- a/setup.py
+++ b/setup.py
@@ -12,6 +12,7 @@ install_requires = [
     'pytz==2016.4',
     'python-social-auth==0.2.19',
     'tornado',
+    'selenium',
 ]
 
 setup(
diff --git a/yaksh/live_server_tests/load_test.py b/yaksh/live_server_tests/load_test.py
index 17934d4..21c25ba 100644
--- a/yaksh/live_server_tests/load_test.py
+++ b/yaksh/live_server_tests/load_test.py
@@ -9,11 +9,11 @@ from selenium.webdriver.firefox.webdriver import WebDriver
 from django.contrib.staticfiles.testing import StaticLiveServerTestCase
 
 from yaksh.models import User, Profile, Question, Quiz, Course, QuestionPaper, TestCase
-from selenium_test import SeleniumTest
-
 from yaksh.code_server import ServerPool
 from yaksh import settings
 
+from .selenium_test import SeleniumTest
+
 
 class YakshSeleniumTests(StaticLiveServerTestCase):
     @classmethod
@@ -26,44 +26,46 @@ class YakshSeleniumTests(StaticLiveServerTestCase):
             "yaksh.cpp_code_evaluator.CppCodeEvaluator"
         settings.code_evaluators['bash']['standardtestcase'] = \
             "yaksh.bash_code_evaluator.BashCodeEvaluator"
-        settings.SERVER_POOL_PORT = 53578
         code_server_pool = ServerPool(ports=settings.SERVER_PORTS, pool_port=settings.SERVER_POOL_PORT)
         cls.code_server_pool = code_server_pool
         cls.code_server_thread = t = Thread(target=code_server_pool.run)
         t.start()
 
-        demo_student = User.objects.create_user(username='demo_student',
+        cls.demo_student = User.objects.create_user(username='demo_student',
            password='demo_student',
            email='demo_student@test.com'
         )
-        demo_student_profile = Profile.objects.create(user=demo_student,
+        cls.demo_student_profile = Profile.objects.create(user=cls.demo_student,
             roll_number=3, institute='IIT',
             department='Chemical', position='Student'
         )
 
-        demo_mod = User.objects.create_user(username='demo_mod',
+        cls.demo_mod = User.objects.create_user(username='demo_mod',
            password='demo_mod',
            email='demo_mod@test.com'
         )
-        demo_mod_profile = Profile.objects.create(user=demo_mod,
+        cls.demo_mod_profile = Profile.objects.create(user=cls.demo_mod,
             roll_number=0, institute='IIT',
             department='Chemical', position='Moderator'
         )
 
         course_obj = Course()
-        course_obj.create_demo(demo_mod)
-        demo_course = Course.objects.get(id=1)
+        course_obj.create_demo(cls.demo_mod)
+        cls.demo_course = Course.objects.get(id=1)
 
-        demo_course.students.add(demo_student)
+        cls.demo_course.students.add(cls.demo_student)
 
     @classmethod
     def tearDownClass(cls):
-        User.objects.all().delete()
-        Question.objects.all().delete()
-        Quiz.objects.all().delete()
-        Course.objects.all().delete()
-
-        settings.SERVER_POOL_PORT = 53579
+        # User.objects.all().delete()
+        # Question.objects.all().delete()
+        # Quiz.objects.all().delete()
+        # Course.objects.all().delete()
+        cls.demo_student.delete()
+        cls.demo_student_profile.delete()
+        cls.demo_mod.delete()
+        cls.demo_mod_profile.delete()
+        cls.demo_course.delete()
 
         cls.code_server_pool.stop()
         cls.code_server_thread.join()
diff --git a/yaksh/live_server_tests/selenium_test.py b/yaksh/live_server_tests/selenium_test.py
index 7eeb22c..e6908e7 100644
--- a/yaksh/live_server_tests/selenium_test.py
+++ b/yaksh/live_server_tests/selenium_test.py
@@ -8,6 +8,9 @@ from selenium.common.exceptions import WebDriverException
 import multiprocessing
 import argparse
 
+class SeleniumTestError(Exception):
+    pass
+
 class SeleniumTest():
     def __init__(self, url, quiz_name):
         self.driver = webdriver.Firefox()
@@ -24,9 +27,12 @@ class SeleniumTest():
             self.logout()
             self.driver.close()
         except Exception as e:
-            with open("/tmp/yaksh_load_test_log.txt", "ab") as f:
-                f.write('Username: {0}\nError: {1}\n'.format(username, e))
             self.driver.close()
+            msg = ("An Error occurred while running the Selenium load"
+                " test on Yaksh!"
+                "Error:\n ".format(e))
+
+            raise SeleniumTestError()
 
     def login(self, username, password):
         # get the username, password and submit form elements
@@ -44,7 +50,7 @@ class SeleniumTest():
         for count in range(loop_count):
             self.driver.find_element_by_link_text(question_label).click()
             submit_answer_elem = self.driver.find_element_by_id("check")
-            self.driver.execute_script('editor.setValue({})'.format(answer))
+            self.driver.execute_script('global_editor.editor.setValue({});'.format(answer))
             submit_answer_elem.click()
 
     def test_c_question(self, question_label):
@@ -105,9 +111,9 @@ class SeleniumTest():
         )
         start_exam_elem.click()
 
-        self.test_c_question(question_label=1)
+        self.test_c_question(question_label=2)
         self.test_python_question(question_label=3)
-        self.test_bash_question(question_label=2)
+        self.test_bash_question(question_label=1)
 
     def close_quiz(self):
         quit_link_elem = WebDriverWait(self.driver, 5).until(
diff --git a/yaksh/templates/user.html b/yaksh/templates/user.html
index 1707305..0d1f980 100644
--- a/yaksh/templates/user.html
+++ b/yaksh/templates/user.html
@@ -16,7 +16,7 @@
         <div class= "collapse navbar-collapse" id="navbar">
           <ul class="nav navbar-nav navbar-right">
               <li><a href="{{ URL_ROOT }}/exam/viewprofile"> {{ user.get_full_name.title }} </a></li>
-              <li><a style='cursor:pointer' onClick='location.replace("{{URL_ROOT}}/exam/logout/");'> <span class="glyphicon glyphicon-log-out">Logout </span></a></li>
+              <li><a style='cursor:pointer' id='logout' onClick='location.replace("{{URL_ROOT}}/exam/complete/");'> <span class="glyphicon glyphicon-log-out">Logout </span></a></li>
           </ul>
         </div><!-- /.navbar -->
       </div><!-- /.container -->
diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index 6218b18..1f6e67d 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -89,7 +89,10 @@ function call_skip(url)
 }
 </script>
 <script>
-    $(document).ready(function(){
+
+  var init_val = '{{ last_attempt|escape_quotes|safe }}';
+  var global_editor = {};
+  $(document).ready(function(){
   // Codemirror object, language modes and initial content
   // Get the textarea node
   var textarea_node = document.querySelector('#answer');
@@ -115,17 +118,15 @@ function call_skip(url)
   };
 
   // Initialize the codemirror editor
-  var editor = CodeMirror.fromTextArea(textarea_node, options);
+  global_editor.editor = CodeMirror.fromTextArea(textarea_node, options);
 
   // Setting code editors initial content
-  editor.setValue('{{ last_attempt|escape_quotes|safe }}')
+  global_editor.editor.setValue(init_val);
 
   function reset_editor() {
-      editor.setValue('{{ last_attempt|escape_quotes|safe }}');
-      editor.clearHistory();
+      global_editor.editor.setValue(init_val);
+      global_editor.editor.clearHistory();
   }
-
-
     });
 </script>
 
-- 
cgit 


From 15deb7d186746d8fcba53ecba876ae746767e26d Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Wed, 1 Mar 2017 18:36:29 +0530
Subject: Pin the version for selenium in requirements and setup.py

---
 requirements/requirements-common.txt | 2 +-
 setup.py                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements/requirements-common.txt b/requirements/requirements-common.txt
index 8138a4f..ad29291 100644
--- a/requirements/requirements-common.txt
+++ b/requirements/requirements-common.txt
@@ -3,4 +3,4 @@ django-taggit==0.18.1
 pytz==2016.4
 python-social-auth==0.2.19
 tornado
-selenium
+selenium==2.53.6
diff --git a/setup.py b/setup.py
index b4b3015..e7d1cbc 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ install_requires = [
     'pytz==2016.4',
     'python-social-auth==0.2.19',
     'tornado',
-    'selenium',
+    'selenium==2.53.6',
 ]
 
 setup(
-- 
cgit 


From 08641e715174b6361f7f4b26625ed7cd3b10cc26 Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Thu, 2 Mar 2017 16:30:26 +0530
Subject: Modify travis.yml to: - Install dependencies from requirements and
 use setup.py Modify setup.py to remove selenium from install_requires

---
 .travis.yml | 13 +++++--------
 setup.py    |  1 -
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index da71f7a..f1c4dab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,14 +4,6 @@ python:
   - "2.7"
   - "3.5"
 
-env:
-  - DJANGO=1.9.5
-
-# command to install dependencies
-install:
-  - pip install git+https://github.com/FOSSEE/online_test.git#egg=yaksh-0.1
-  - pip install -q Django==$DJANGO
-
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y scilab
@@ -19,6 +11,11 @@ before_install:
   - "sh -e /etc/init.d/xvfb start"
   - sleep 3 # give xvfb some time to start
 
+# command to install dependencies
+install:
+  - pip install -r requirements/requirements-common.txt
+  - python setup.py develop
+
 # command to run tests
 script:
   - python manage.py test -v 2 yaksh
diff --git a/setup.py b/setup.py
index e7d1cbc..37ed948 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,6 @@ install_requires = [
     'pytz==2016.4',
     'python-social-auth==0.2.19',
     'tornado',
-    'selenium==2.53.6',
 ]
 
 setup(
-- 
cgit 


From 76e3a9575cc1211509a2986970aa299eeaae6c6c Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Thu, 2 Mar 2017 19:21:14 +0530
Subject: Remove commented code

---
 yaksh/live_server_tests/load_test.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/yaksh/live_server_tests/load_test.py b/yaksh/live_server_tests/load_test.py
index 21c25ba..47d267c 100644
--- a/yaksh/live_server_tests/load_test.py
+++ b/yaksh/live_server_tests/load_test.py
@@ -57,10 +57,6 @@ class YakshSeleniumTests(StaticLiveServerTestCase):
 
     @classmethod
     def tearDownClass(cls):
-        # User.objects.all().delete()
-        # Question.objects.all().delete()
-        # Quiz.objects.all().delete()
-        # Course.objects.all().delete()
         cls.demo_student.delete()
         cls.demo_student_profile.delete()
         cls.demo_mod.delete()
-- 
cgit 


From ea58f85532a6a5cc42780d90c907cfb6e8a6d95d Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Fri, 3 Mar 2017 10:43:39 +0530
Subject: Add message argument to SeleniumTestError

---
 yaksh/live_server_tests/selenium_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yaksh/live_server_tests/selenium_test.py b/yaksh/live_server_tests/selenium_test.py
index e6908e7..d91f3ec 100644
--- a/yaksh/live_server_tests/selenium_test.py
+++ b/yaksh/live_server_tests/selenium_test.py
@@ -32,7 +32,7 @@ class SeleniumTest():
                 " test on Yaksh!"
                 "Error:\n ".format(e))
 
-            raise SeleniumTestError()
+            raise SeleniumTestError(msg)
 
     def login(self, username, password):
         # get the username, password and submit form elements
-- 
cgit