fixed styleerrors

Author: rtschu

.travis.yml

@@ -80,7 +80,6 @@ script:
 after_success:
   - bash <(curl -s https://codecov.io/bash)
 
-# TODO re-add static
 stages:
   - static
   - name: develop

classes/lsf_api_mock_testable.php

@@ -45,7 +45,6 @@ function get_course_by_veranstid ($courseid) {
     $fulldata = \behat_block_evasys_sync::get_coursedata_by_courseid($moodleid);
     $coursedata = $fulldata->evacourses[$courseid];
 
-
     $result = new \stdClass();
     if (!$coursedata->valid) {
         $result->veranstid = null;

tests/behat/behat_block_evasys_sync.php

@@ -82,7 +82,7 @@ public static function &get_coursedata_by_courseid($courseid) {
         if (!array_key_exists($courseid, self::$coursedata)) {
             $jsondata = get_course($courseid)->summary;
             $localcoursedata = json_decode($jsondata);
-            if(!is_object($localcoursedata)) {
+            if (!is_object($localcoursedata)) {
                 $localcoursedata = new \stdClass(); // If there is no data initialize a data object.
             }
             self::$coursedata[$courseid] = $localcoursedata;
@@ -142,7 +142,7 @@ private function add_lsf_evasys_course($moodlecourse, $valid, $veranstnr = null,
     /**
      * @Given I load the evasys block
      */
-    public function I_load_the_evasys_block () {
+    public function i_load_the_evasys_block () {
         self::write_coursedata_to_persistent_storage();
         $this->execute('behat_general::i_click_on', ["Show status of surveys", 'button']);
     }
@@ -154,7 +154,7 @@ public function there_are_evasyscourses_mapped_to_course_with_shortname($number,
         $count = intval($number);
         $lsfids = array();
         for ($i = 0; $i < $count; $i++) {
-            $surveystatus = $state == "mixed" ? ($i==0 ? "closed" : "open)") : $state; // If mixed first will be closed, rest open.
+            $surveystatus = $state == "mixed" ? ($i == 0 ? "closed" : "open)") : $state; // If mixed first will be closed, rest open.
             $lsfid = $this->add_lsf_evasys_course($shortname, true, $i, "WS 2017/18", 100,
                 "DynamicSurvey" . $i, 1, $surveystatus);
             array_push($lsfids, $lsfid);
@@ -209,8 +209,8 @@ public function only_invalid_mappings_are_present_for_course ($shortname) {
 
     /**
      * @Given the idnumber of course :shortname links to a :state Evasyscourse
-      */
-    public function the_idnumber_of_course_links_to_a_Evasyscourse($shortname, $state) {
+     */
+    public function the_idnumber_of_course_links_to_a_evasyscourse($shortname, $state) {
         // If the state is mixed, the course linked by the idnumber should be "open" because we know there is at least
         // one "closed" course mapped.
         $surveystatus = $state == "mixed" ? "open" : $state;

tests/behat/fulltest.feature

@@ -6,7 +6,7 @@ Feature: Tests all use-cases of the Evasys-block
       | username | firstname | lastname | email |
       | teacher1 | Teacher | 1 | teacher1@example.com |
       | student1 | Student | 1 | student1@example.com |
-      | tutor1   | Tutor   | 1 | tutor1@example.com | 
+      | tutor1   | Tutor   | 1 | tutor1@example.com |
     And the following "courses" exist:
       | fullname | shortname | category |
       | Course 1 | C1 | 0 |
@@ -28,7 +28,7 @@ Feature: Tests all use-cases of the Evasys-block
     And I turn editing mode off
     Then I should see "Change mapping"
     And I should not see "Name:"
-And I should not see "IdnumberSurvey"
+    And I should not see "IdnumberSurvey"
     And I should not see "DynamicSurvey"
 
   Scenario: If there is no standardtimemode I should not see the option to use it
@@ -161,7 +161,7 @@ And I should not see "IdnumberSurvey"
     And only tutors enrolled in course C1
     And there is no idnumber mapped to course C1
     And only invalid mappings are present for course C1
-    And the internal state of course C1 is "closed"
+    And the internal state of course C1 is "notopened"
     And I turn editing mode on
     And I add the "EvaSys Sync" block
     And I turn editing mode off
@@ -673,7 +673,7 @@ And I should not see "IdnumberSurvey"
     And only tutors enrolled in course C1
     And the idnumber for course C1 is invalid
     And no courses are mapped to course C1
-    And the internal state of course C1 is "closed"
+    And the internal state of course C1 is "notopened"
     And I turn editing mode on
     And I add the "EvaSys Sync" block
     And I turn editing mode off
@@ -837,7 +837,7 @@ And I should not see "IdnumberSurvey"
     And only tutors enrolled in course C1
     And the idnumber for course C1 is invalid
     And only invalid mappings are present for course C1
-    And the internal state of course C1 is "closed"
+    And the internal state of course C1 is "notopened"
     And I turn editing mode on
     And I add the "EvaSys Sync" block
     And I turn editing mode off
@@ -1010,7 +1010,7 @@ And I should not see "IdnumberSurvey"
     And students enrolled in course C1
     And there is no idnumber mapped to course C1
     And only invalid mappings are present for course C1
-    And the internal state of course C1 is "notopened"
+    And there is no internal record of course C1
     And I turn editing mode on
     And I add the "EvaSys Sync" block
     And I turn editing mode off
@@ -1584,7 +1584,7 @@ And I should not see "IdnumberSurvey"
     And students enrolled in course C1
     And the idnumber for course C1 is invalid
     And no courses are mapped to course C1
-    And the internal state of course C1 is "notopened"
+    And there is no internal record of course C1
     And I turn editing mode on
     And I add the "EvaSys Sync" block
     And I turn editing mode off
@@ -1729,7 +1729,7 @@ And I should not see "IdnumberSurvey"
     And students enrolled in course C1
     And the idnumber for course C1 is invalid
     And only invalid mappings are present for course C1
-    And the internal state of course C1 is "notopened"
+    And there is no internal record of course C1
     And I turn editing mode on
     And I add the "EvaSys Sync" block
     And I turn editing mode off

tests/behat/generator/generator.py

@@ -27,7 +27,7 @@ def get_checks(mode, standardtime, students_state, idnumber_state, mapped_state,
     checks = ""
     # If there are no mapped courses the Block not offer the option to "Show surveys"
     if (idnumber_state == "none") and (mapped_state == "none"):
-        return "Then I should see \"Change mapping\"\n    And I should not see \"Name:\"\n"
+        return "Then I should see \"Change mapping\"\n    And I should not see \"Name:\"\n    "
 
     # In all other cases (even if there are only invalid entries) we need to click the button to start code execution
     checks += "And I load the evasys block\n"

tests/behat/generator/steps.py

@@ -6,7 +6,7 @@
       | username | firstname | lastname | email |\n\
       | teacher1 | Teacher | 1 | [email protected] |\n\
       | student1 | Student | 1 | [email protected] |\n\
-      | tutor1   | Tutor   | 1 | [email protected] | \n\
+      | tutor1   | Tutor   | 1 | [email protected] |\n\
     And the following "courses" exist:\n\
       | fullname | shortname | category |\n\
       | Course 1 | C1 | 0 |\n\