Dev

booking/forms.py

@@ -42,10 +42,3 @@ class Meta:
         widgets = {'person': forms.HiddenInput(), 'repeat': 'noRepeat'}
 
 
-    def clean(self):
-
-        cleaned_data = super().clean()
-        s_date = cleaned_data.get('start')
-        loc = cleaned_data.get('location')
-        e_date = cleaned_data.get('end')
-

booking/tests/test_calendar.py

@@ -0,0 +1,116 @@
+from django.conf import settings
+from ntnui.tests.browser.lib.browser_test_case import ChromeTestCase, FirefoxTestCase
+from ntnui.tests.browser.lib.helpers import login_user
+from selenium.webdriver.support.wait import WebDriverWait
+from groups.models import Invitation, SportsGroup
+from accounts.models import User
+from selenium import webdriver
+from booking.models import Booking, Location
+from django.contrib.staticfiles.testing import StaticLiveServerTestCase, LiveServerTestCase
+from django.contrib.staticfiles.testing import StaticLiveServerTestCase
+from selenium.webdriver.firefox.webdriver import WebDriver
+from selenium.webdriver.common.keys import Keys
+
+class MySeleniumTests(StaticLiveServerTestCase):
+    fixtures = ['user-data.json']
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.selenium = WebDriver()
+        cls.selenium.implicitly_wait(10)
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.selenium.quit()
+        super().tearDownClass()
+
+    def test_login(self):
+        self.selenium.get('%s%s' % (self.live_server_url, '/login/'))
+        username_input = self.selenium.find_element_by_name("username")
+        username_input.send_keys('myuser')
+        password_input = self.selenium.find_element_by_name("password")
+        password_input.send_keys('secret')
+        self.selenium.find_element_by_xpath('//input[@value="Log in"]').click()
+
+
+
+
+
+
+def see_calendar(cls, browser):
+    browser.get(cls.server_url + '/booking')
+    gym = browser.find_element_by_id('gym')
+    gym.click()
+    filtering = browser.find_elements_by_xpath('//input[@name="opradio" and @value="GymName"]')[0]
+    filtering.click()
+    current_loc = browser.find_element_by_id('current-location')
+    cls.assertEqual('GymName', current_loc.get_attribute('innerHTML').trim())
+
+
+def see_booked(cls, browser):
+    browser.get(cls.server_url + '/booking')
+    gym = browser.find_element_by_id('gym')
+    gym.click()
+    filtering = browser.find_elements_by_xpath('//input[@name="opradio" and @value="GymName"]')[0]
+    filtering.click()
+    current_loc = browser.find_element_by_id('current-location')
+    day = browser.find_element_by_id(cls.date)
+    day.click()
+    booked_by = browser.find_element_by_xpath('//input[@class="card-body 3" and @title="Click to see your booking"')
+    author = Booking.objects.filter(start=cls.date+' 12:00')[0].person
+    cls.assertEqual(booked_by, author)
+
+def profile_bookings(cls, browser):
+    browser.get(cls.server_url+'/')
+
+def create_booking(cls, browser):
+    browser.get(cls.server_url + '/booking')
+    gym = browser.find_element_by_id('gym')
+    gym.click()
+    filtering = browser.find_elements_by_xpath('//input[@name="opradio" and @value="GymName"]')[0]
+    filtering.click()
+    current_loc = browser.find_element_by_id('current-location')
+    day = browser.find_element_by_id(cls.date)
+    day.click()
+    title = browser.find_element_by_id('id_title')
+    title.send_keys('new booking')
+    desc = browser.find_element_by_id('id_description')
+    desc.send_keys('description for new booking')
+    desc.send_keys(Keys.RETURN)
+    booking = Booking.objects.filter(title='new booking')[0]
+    cls.assertTrue(booking.description=='description for new booking')
+
+
+class CalendarChrome(ChromeTestCase):
+    fixtures = ['users.json', 'groups.json', 'membership.json', 'board.json']
+
+    def setUp(self):
+        self.loc = Location.objects.create(name='GymName', address='123 st', description='best gym')
+        self.date = '2018-06-10'
+        Booking.objects.create(location=self.loc, title='Jump', description='Jump around', start=self.date+' 12:00', end=self.date+' 13:00')
+        login_user(self, self.chrome)
+
+    def test_see_calendar(self):
+        see_calendar(self, self.chrome)
+
+    def test_create_booking(self):
+        see_booked(self, self.chrome)
+
+
+class CalendarFirefox(FirefoxTestCase):
+    fixtures = ['users.json', 'groups.json', 'membership.json', 'board.json']
+
+    def setUp(self):
+        self.loc = Location.objects.create(name='GymName', address='123 st', description='best gym')
+        self.date = '2018-06-10'
+        Booking.objects.create(location=self.loc, title='Jump', description='Jump around', start=self.date+' 12:00', end=self.date+' 13:00')
+        login_user(self, self.firefox)
+
+    def test_see_calendar(self):
+        see_calendar(self, self.firefox)
+
+    def test_create_booking(self):
+        see_booked(self, self.firefox)
+
+

booking/tests/test_edit_delete.py

@@ -30,13 +30,8 @@ def test_enqueued(self):
         Booking.objects.create(location=self.location, start=self.start, end=self.end, description=self.d1)
         Booking.objects.create(location=self.location, start=self.start, end=self.end, description=self.d2)
         qNo1 = Booking.objects.filter(location=self.location, start=self.start, end=self.end, description=self.d1)
-        qNo2 = Booking.objects.filter(location=self.location, start=self.start, end=self.end, description=self.d2)
-        print(qNo1[:1].get().queueNo)
-        print(qNo2[:1].get().queueNo)
-        for i in range(len(qNo1)):
-            print(qNo1[i])
+        qNo2 = Booking.objects.filter(location=self.location, start=self.start, end=self.end, description=self.d2)        
         self.assertGreater(qNo2[0].queueNo, qNo1[0].queueNo)
-        # self.assertTrue(False)
 
     def test_multi_enq(self):   
         #create bookings in database                                  
@@ -47,25 +42,12 @@ def test_multi_enq(self):
         qNo1 = Booking.objects.filter(location=self.location, start=self.start, end=self.end, description=self.d1)
         qNo2 = Booking.objects.filter(location=self.location, start=self.s2, end=self.e2, description=self.d2)
         qNo3 = Booking.objects.filter(location=self.location, start=self.s3, end=self.e3, description=self.d3)
-        # qNo3 = Booking.objects.filter(location=location, )
-        print(qNo1[:1].get().queueNo)
-        print(qNo2[:1].get().queueNo)
-        print(qNo3[:1].get().queueNo)
         #Test if booking 1 is before booking 2 in queue
         self.assertGreater(qNo2[:1].get().queueNo, qNo1[:1].get().queueNo)
         #test if booking 3 is before booking 2 in queue
         self.assertGreater(qNo2[:1].get().queueNo, qNo3[:1].get().queueNo)
 
-    def test__post_enq(self):
-        #TODO: update to selenium browser test
-        response = self.client.post(self.url, {"location": self.location,
-                                                "Start": self.start,
-                                                "End": self.end,
-                                                "Description": self.d1})
-        qNo1 = Booking.objects.filter(location=self.location, start=self.start, end=self.end, description=self.d1)                                                
-        print(Booking.objects.all())
-        print(response)
-        self.assertTrue(False)
+
 
     def test_delete(self):
         date = "2018-04-15 "
@@ -79,23 +61,16 @@ def test_delete(self):
         Booking.objects.create(location=self.location, start=s2, end=s3, description=self.d2)
         Booking.objects.create(location=self.location, start=s3, end=e3, description=self.d3)
         #before
-        print("before")
         b2 = Booking.objects.filter(location=self.location, start=s2, end=s3, description=self.d2)[0]
         b3 = Booking.objects.filter(location=self.location, start=s3, end=e3, description=self.d3)[0]
-        print(b2.queueNo)
-        print(b3.queueNo)
         #delete first booking
         b1 = Booking.objects.filter(location=self.location, start=s1, end=e1, description=self.d1)[0]
         b1.delete()
         #check if later bookings ahve updated queueNo
-        print("after")
         b2 = Booking.objects.filter(location=self.location, start=s2, end=s3, description=self.d2)[0]
         b3 = Booking.objects.filter(location=self.location, start=s3, end=e3, description=self.d3)[0]
-        # print(Booking.objects.all())
-        print(b2.queueNo)
-        print(b3.queueNo)
         self.assertEqual(b2.queueNo, b3.queueNo)
-        # self.assertTrue(False)
+
 
     def test_edit(self):
         b1 = Booking(location=self.location, start=self.s1, end=self.e1, description=self.d1)
@@ -108,8 +83,6 @@ def test_edit(self):
         b2.start = self.e3
         b2.save()
         qNo2 = b2.queueNo
-        print("before ", qNo1)
-        print("after", qNo2)
         self.assertGreater(qNo1, qNo2)
         # self.assertTrue(False)
 
@@ -126,7 +99,6 @@ def test_edit_inplace(self):
         b2.save()
         b3 = Booking(location=self.location, start=s3, end=e3)
         b3.save()
-        print(b2.start)
         self.assertGreater(b3.queueNo, b2.queueNo)
         #TODO: edit b2 to 14:00-15:00, check if b3 still after b2
 

booking/tests/test_recurring.py

@@ -53,7 +53,6 @@ def test_repeatBooking(self, repeat=True):
                         if (cal_day[0] < day and m+1 == month) or cal_day[0]==0:
                             continue
                         if cal_day[1]==dayofweek:
-                            # print("here")
                             if m <9: #format month
                                 cal_m = "0"+str(m+1)
                             else:

booking/tests/test_views.py

@@ -1,4 +1,60 @@
-from django.test import TestCase, RequestFactory
+from django.test import TestCase, RequestFactory, Client
 from accounts.models import User
 from booking.models import Booking, Location
+from booking import views
 
+class test_views_func(TestCase):
+
+    def setUp(self):
+        self.factory = RequestFactory()
+        self.c = Client()
+        self.user = User.objects.create_superuser(email='snaic@fastmail.com', password='gottagofast') 
+        self.c.login(email='snaic@fastmail.com', password='gottagofast')
+        loc = Location(name='fasttrack')
+        loc.save()
+        Booking.objects.create(location=loc, title='runfast', description='run faster', start='2018-07-20 13:00', end='2018-07-20 14:00')
+
+    def test_error_404(self):
+        request = self.factory.get('/notareal/site/')
+        request.user = self.user
+        response = views.error_404(request)
+        self.assertContains(response, "404 Error")
+
+
+    def test_index(self):
+        response = self.c.get('/booking/')
+        self.assertTemplateUsed(response, 'booking/booking.html')
+
+
+    def test_booking_list(self):        
+        response = self.c.get('/booking/bookings_list/')        
+        self.assertContains(response, 'My bookings')
+
+
+    def test_booking_manage(self):
+        request = self.factory.get('/booking/bookings_manage')
+        request.user = self.user
+        response = views.booking_manage(request)
+        self.assertContains(response, 'Manage bookings')        
+
+    def test_api(self):
+        response = self.c.get('/booking/api')
+
+        bookings = Booking.objects.all().values('title', 'description', 'start', 'end', 'location__name',
+                                          'person__first_name', 'queueNo', 'group', 'person__id',
+                                          'person__email', 'person__last_name')
+
+        title1 = bookings[0]['title']
+        self.assertContains(response, title1)
+
+
+    def test_save_booking_form(self):
+
+        self.assertTrue(True)
+
+    def test_booking_create(self):
+
+        self.assertTrue(True)
+
+    def test_booking_create_from_calendar(self):
+        self.assertTrue(True)

ntnui/settings.py

@@ -35,7 +35,7 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = ['tester', 'localhost', '0.0.0.0', '127.0.0.1']
+ALLOWED_HOSTS = ['tester', 'localhost', '0.0.0.0', '127.0.0.1', 'selenium']
 ALLOWED_HOST = ["*"]
 
 # Application definition

ntnui/tests/browser/lib/browser_test_case.py

@@ -9,13 +9,17 @@
 class ChromeTestCase(StaticLiveServerTestCase):
     @classmethod
     def setUpClass(self):
-        if os.environ.get('BROWSER') == 'local':
+        # print('dis',os.environ)
+        #Problem: environ has no key BROWSER
+        if True:# os.environ.get('BROWSER') == 'local':
             super().setUpClass()
             self.chrome = webdriver.Chrome()
             self.server_url = self.live_server_url
         else:
             self.host = socket.gethostbyname(socket.gethostname())
+            print(self.host)
             super(ChromeTestCase, self).setUpClass()
+            print(webdriver.Remote)
             self.chrome = webdriver.Remote(
                 command_executor='http://selenium:4444/wd/hub',
                 desired_capabilities=DesiredCapabilities.CHROME)