Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #8869: Add innerHTML lint check #8870

Merged
merged 10 commits into from
Mar 28, 2020
Merged

Fix #8869: Add innerHTML lint check #8870

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bcf1c39
Add a lint check for innerHTML
Mar 18, 2020
7dac20e
fix _check_for_mandatory_pattern_in_file issue
Mar 18, 2020
a06c445
fix lint issues
Mar 18, 2020
e53624d
fix errors from before linter was introduced
Mar 19, 2020
242a358
Merge remote-tracking branch 'upstream/develop' into add-innerHTML-li…
Mar 19, 2020
cadd830
fix path issue
Mar 26, 2020
0fe385a
Merge remote-tracking branch 'upstream/develop' into add-innerHTML-li…
Mar 26, 2020
3ea453e
fix conflicts and merge
Mar 26, 2020
0a2abae
Merge remote-tracking branch 'upstream/develop' into add-innerHTML-li…
Mar 27, 2020
dca94ed
Merge remote-tracking branch 'upstream/develop' into add-innerHTML-li…
Mar 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix path issue
  • Loading branch information
Kevin Thomas committed Mar 26, 2020
commit cadd830a3f14db4fa13eabe238c946a9ed464de4
2 changes: 1 addition & 1 deletion extensions/interactions/CodeRepl/protractor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

var waitFor = require(
process.cwd() + 'core/tests/protractor_utils/waitFor.js');
process.cwd() + '/core/tests/protractor_utils/waitFor.js');

var customizeInteraction = function(interactionEditor, placeHolderText) {
browser.executeScript(
Expand Down
4 changes: 2 additions & 2 deletions extensions/interactions/Continue/protractor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
* interaction.
*/

var objects = require(process.cwd() + 'extensions/objects/protractor.js');
var objects = require(process.cwd() + '/extensions/objects/protractor.js');
var waitFor = require(
process.cwd() + 'core/tests/protractor_utils/waitFor.js');
process.cwd() + '/core/tests/protractor_utils/waitFor.js');

var customizeInteraction = function(elem, buttonText) {
if (buttonText) {
Expand Down
2 changes: 1 addition & 1 deletion extensions/interactions/EndExploration/protractor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* interaction.
*/

var objects = require(process.cwd() + 'extensions/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.
Expand Down
2 changes: 1 addition & 1 deletion extensions/interactions/FractionInput/protractor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* @fileoverview End-to-end testing utilities for the Fraction interaction.
*/

var objects = require(process.cwd() + 'extensions/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')))
Expand Down
4 changes: 2 additions & 2 deletions extensions/interactions/GraphInput/protractor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
* @fileoverview End-to-end testing utilities for the GraphInput interaction.
*/

var forms = require(process.cwd() + 'core/tests/protractor_utils/forms.js');
var forms = require(process.cwd() + '/core/tests/protractor_utils/forms.js');
var waitFor = require(
process.cwd() + 'core/tests/protractor_utils/waitFor.js');
process.cwd() + '/core/tests/protractor_utils/waitFor.js');

var customizeInteraction = function(interactionEditor, graphDict) {
var graphInputContainer = interactionEditor.element(by.css(
Expand Down
2 changes: 1 addition & 1 deletion extensions/interactions/MultipleChoiceInput/protractor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* interaction.
*/

var forms = require(process.cwd() + '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
Expand Down
2 changes: 1 addition & 1 deletion extensions/interactions/TextInput/protractor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* @fileoverview End-to-end testing utilities for the Text interaction.
*/

var objects = require(process.cwd() + 'extensions/objects/protractor.js');
var objects = require(process.cwd() + '/extensions/objects/protractor.js');

var customizeInteraction = function(elem, placeholderText, heightOfBox) {
objects.UnicodeStringEditor(
Expand Down
2 changes: 1 addition & 1 deletion extensions/rich_text_components/Collapsible/protractor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* end-to-end testing with Protractor.js
*/

var forms = require(process.cwd() + 'core/tests/protractor_utils/forms.js');
var forms = require(process.cwd() + '/core/tests/protractor_utils/forms.js');

var customizeComponent = function(modal, heading, contentInstructions) {
forms.UnicodeEditor(
Expand Down
2 changes: 1 addition & 1 deletion extensions/rich_text_components/Image/protractor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* testing with Protractor.js
*/

var objects = require(process.cwd() + 'extensions/objects/protractor.js');
var objects = require(process.cwd() + '/extensions/objects/protractor.js');

var customizeComponent = function(modal, filepath, name) {
modal.element(by.tagName('button')).click();
Expand Down
2 changes: 1 addition & 1 deletion extensions/rich_text_components/Link/protractor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* end-to-end testing with Protractor.js
*/

var objects = require(process.cwd() + 'extensions/objects/protractor.js');
var objects = require(process.cwd() + '/extensions/objects/protractor.js');

var customizeComponent = function(modal, url) {
objects.SanitizedUrlEditor(
Expand Down
2 changes: 1 addition & 1 deletion extensions/rich_text_components/Math/protractor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* end-to-end testing with Protractor.js
*/

var objects = require(process.cwd() + 'extensions/objects/protractor.js');
var objects = require(process.cwd() + '/extensions/objects/protractor.js');

var customizeComponent = function(modal, rawLatex) {
objects.MathLatexStringEditor(
Expand Down
2 changes: 1 addition & 1 deletion extensions/rich_text_components/Skillreview/protractor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* end-to-end testing with Protractor.js
*/

var objects = require(process.cwd() + 'extensions/objects/protractor.js');
var objects = require(process.cwd() + '/extensions/objects/protractor.js');

var customizeComponent = function(modal, index) {
objects.SkillSelector(
Expand Down
2 changes: 1 addition & 1 deletion extensions/rich_text_components/Tabs/protractor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* end-to-end testing with Protractor.js
*/

var forms = require(process.cwd() + '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
Expand Down
2 changes: 1 addition & 1 deletion extensions/rich_text_components/Video/protractor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* end-to-end testing with Protractor.js
*/

var objects = require(process.cwd() + 'extensions/objects/protractor.js');
var objects = require(process.cwd() + '/extensions/objects/protractor.js');

var customizeComponent = function(
modal, youtubeId, startTime, endTime, ifAutoplay) {
Expand Down