fix errors from before linter was introduced

oppia · kevinlee12 · Mar 28, 2020 · Mar 18, 2020 · Mar 18, 2020 · Mar 18, 2020
commit e53624d3b3f25456b49871075d93e9fdb00b2245
@@ -17,7 +17,8 @@
  * Editor.
  */
 
-var waitFor = require('../../../core/tests/protractor_utils/waitFor.js');
+var waitFor = require(
+  process.cwd() + 'core/tests/protractor_utils/waitFor.js');
 
 var customizeInteraction = function(interactionEditor, placeHolderText) {
   browser.executeScript(

@@ -17,8 +17,9 @@
  * interaction.
  */
 
-var objects = require('../../objects/protractor.js');
-var waitFor = require('../../../core/tests/protractor_utils/waitFor.js');
+var objects = require(process.cwd() + 'extensions/objects/protractor.js');
+var waitFor = require(
+  process.cwd() + 'core/tests/protractor_utils/waitFor.js');
 
 var customizeInteraction = function(elem, buttonText) {
   if (buttonText) {

@@ -17,7 +17,7 @@
  * interaction.
  */
 
-var objects = require('../../objects/protractor.js');
+var objects = require(process.cwd() + 'extensions/objects/protractor.js');
 /**
  * Add recommended exploration Id to End Exploration interaction.
  * @param {Object} elem - The Customize Exploration modal for End Exploration.

@@ -16,7 +16,7 @@
  * @fileoverview End-to-end testing utilities for the Fraction interaction.
  */
 
-var objects = require('../../objects/protractor.js');
+var objects = require(process.cwd() + 'extensions/objects/protractor.js');
 
 var customizeInteraction = function(elem, requireSimplestForm) {
   objects.BooleanEditor(elem.element(by.tagName('schema-based-bool-editor')))

@@ -16,9 +16,9 @@
  * @fileoverview End-to-end testing utilities for the GraphInput interaction.
  */
 
-var forms = require('../../../core/tests/protractor_utils/forms.js');
-var objects = require('../../objects/protractor.js');
-var waitFor = require('../../../core/tests/protractor_utils/waitFor.js');
+var forms = require(process.cwd() + 'core/tests/protractor_utils/forms.js');
+var waitFor = require(
+  process.cwd() + 'core/tests/protractor_utils/waitFor.js');
 
 var customizeInteraction = function(interactionEditor, graphDict) {
   var graphInputContainer = interactionEditor.element(by.css(

@@ -16,8 +16,6 @@
  * @fileoverview End-to-end testing utilities for the LogicProof interaction.
  */
 
-var objects = require('../../objects/protractor.js');
-
 var customizeInteraction = function(elem, assumption, target, defaultText) {
   elem.element(by.id('logicQuestionAssumptions')).sendKeys(assumption);
   elem.element(by.id('logicQuestionTarget')).sendKeys(target);

@@ -17,8 +17,6 @@
  * interaction
  */
 
-var objects = require('../../objects/protractor.js');
-
 var mathExpressionInputTag = function(parentElement) {
   return parentElement.element(by.tagName(
     'oppia-interactive-math-expression-input'));

@@ -17,7 +17,7 @@
  * interaction.
  */
 
-var forms = require('../../../core/tests/protractor_utils/forms.js');
+var forms = require(process.cwd() + 'core/tests/protractor_utils/forms.js');
 
 // The members of richTextInstructionsArray are functions, one for each option,
 // which will each be passed a 'handler' that they can use to edit the

@@ -17,8 +17,6 @@
  * Interaction.
  */
 
-var objects = require('../../objects/protractor.js');
-
 var customizeInteraction = function() {
   // There are no customizations.
 };

@@ -17,8 +17,6 @@
  * interaction.
  */
 
-var objects = require('../../objects/protractor.js');
-
 var customizeInteraction = function() {
   // There are no customizations.
 };

@@ -16,7 +16,7 @@
  * @fileoverview End-to-end testing utilities for the Text interaction.
  */
 
-var objects = require('../../objects/protractor.js');
+var objects = require(process.cwd() + 'extensions/objects/protractor.js');
 
 var customizeInteraction = function(elem, placeholderText, heightOfBox) {
   objects.UnicodeStringEditor(

@@ -17,8 +17,6 @@
  * tests.
  */
 
-var forms = require('../../core/tests/protractor_utils/forms.js');
-
 // NOTE: all editors for objects that are used as parameters in a rule must
 // implement a setValue() function to which a single argument can be sent
 // that will completely determine the object.

@@ -17,8 +17,7 @@
  * end-to-end testing with Protractor.js
  */
 
-var forms = require('../../../core/tests/protractor_utils/forms.js');
-var general = require('../../../core/tests/protractor_utils/general.js');
+var forms = require(process.cwd() + 'core/tests/protractor_utils/forms.js');
 
 var customizeComponent = function(modal, heading, contentInstructions) {
   forms.UnicodeEditor(

@@ -17,7 +17,7 @@
  * testing with Protractor.js
  */
 
-var objects = require('../../objects/protractor.js');
+var objects = require(process.cwd() + 'extensions/objects/protractor.js');
 
 var customizeComponent = function(modal, filepath, name) {
   modal.element(by.tagName('button')).click();

@@ -17,7 +17,7 @@
  * end-to-end testing with Protractor.js
  */
 
-var objects = require('../../objects/protractor.js');
+var objects = require(process.cwd() + 'extensions/objects/protractor.js');
 
 var customizeComponent = function(modal, url) {
   objects.SanitizedUrlEditor(

@@ -17,7 +17,7 @@
  * end-to-end testing with Protractor.js
  */
 
-var objects = require('../../objects/protractor.js');
+var objects = require(process.cwd() + 'extensions/objects/protractor.js');
 
 var customizeComponent = function(modal, rawLatex) {
   objects.MathLatexStringEditor(

@@ -17,7 +17,7 @@
  * end-to-end testing with Protractor.js
  */
 
-var objects = require('../../objects/protractor.js');
+var objects = require(process.cwd() + 'extensions/objects/protractor.js');
 
 var customizeComponent = function(modal, index) {
   objects.SkillSelector(

@@ -17,7 +17,7 @@
  * end-to-end testing with Protractor.js
  */
 
-var forms = require('../../../core/tests/protractor_utils/forms.js');
+var forms = require(process.cwd() + 'core/tests/protractor_utils/forms.js');
 
 // The 'tabArray' arg should be an array of dictionaries with keys:
 //   'title': a string

@@ -17,7 +17,7 @@
  * end-to-end testing with Protractor.js
  */
 
-var objects = require('../../objects/protractor.js');
+var objects = require(process.cwd() + 'extensions/objects/protractor.js');
 
 var customizeComponent = function(
     modal, youtubeId, startTime, endTime, ifAutoplay) {

diff --git a/utils.py b/utils.py
@@ -84,7 +84,7 @@ def get_file_contents(filepath, raw_bytes=False, mode='r'):
         *. Either the raw_bytes stream if the flag is set or the
             decoded stream in utf-8 format.
     """
-    with open(filepath, mode) as f:
+    with python_utils.open_file(filepath, mode) as f:
         return f.read() if raw_bytes else f.read().decode('utf-8')