Skip to content

Commit

Permalink
Fix oppia#4275: Embedding e2e test creation (oppia#4482)
Browse files Browse the repository at this point in the history 
* added new exploration similar to protractor_test_1 in embedding test

* fixed linting

* removed XHR from embedding pages, added forms

* removed browser.executeScript, removed form elements

* resolved review requests

* resolved review requests

* fixed lint error

* create new exploration for second embedder test

* review changes
  • Loading branch information
@akumar1503 @shubha1593
akumar1503 authored and shubha1593 committed Jan 23, 2018
1 parent 94c3c83 commit 21564df
Show file tree
Hide file tree
Showing 4 changed files with 351 additions and 140 deletions.
83 changes: 59 additions & 24 deletions assets/scripts/embedding_tests_dev_0.0.1.min.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,36 +6,71 @@ <h2>v0.0.1 (minified)</h2>
the Oppia iframe to the containing page.
</p>

<style type="text/css">
.protractor-test-results {
display: none;
}
</style>

<script src="/assets/scripts/oppia-player-0.0.1.js"></script>
<script src="/assets/scripts/embedding_tests.js"></script>
<script src="../../third_party/static/jquery-3.2.1/jquery.min.js"></script>

<div>
<h3>Iframe embedding</h3>
<iframe src="/embed/exploration/12" width="700" height="600">
</iframe>
</div>
<input class="protractor-test-exploration-id-input-field" type="text" placeholder="explorationId">
<input class="protractor-test-exploration-id-submit-button" type="submit" value="Update Exploration ID" onclick="onChangeExpId()">

<div class="protractor-test-standard">
<h3>Standard embedding of the latest version</h3>
<oppia oppia-id="12"></oppia>
</div>
<div class="protractor-test-results">
<div>
<h3>Iframe embedding</h3>
<iframe src="/embed/exploration/idToBeReplaced" width="700" height="600">
</iframe>
</div>

<div class="protractor-test-old-version">
<h3>Standard embedding of version 1 of the exploration with deferred loading</h3>
<oppia oppia-id="12" autoload="false" exploration-version="1"></oppia>
</div>
<div class="protractor-test-standard">
<h3>Standard embedding of the latest version</h3>
<oppia oppia-id="idToBeReplaced"></oppia>
</div>

<div class="protractor-test-missing-id">
<h3>ERROR: No oppia id specified</h3>
<oppia></oppia>
</div>
<div class="protractor-test-old-version">
<h3>Standard embedding of version 2 of the exploration with deferred loading</h3>
<oppia oppia-id="idToBeReplaced" autoload="false" exploration-version="2"></oppia>
</div>

<div class="protractor-test-invalid-id">
<h3>ERROR: 404 error</h3>
<oppia oppia-id="fake_id"></oppia>
</div>
<div class="protractor-test-missing-id">
<h3>ERROR: No oppia id specified</h3>
<oppia></oppia>
</div>

<div class="protractor-test-invalid-id">
<h3>ERROR: 404 error</h3>
<oppia oppia-id="fake_id"></oppia>
</div>

<div class="protractor-test-invalid-id-deferred">
<h3>ERROR: 404 error with deferred loading</h3>
<oppia oppia-id="fake_id" autoload="false"></oppia>
<div class="protractor-test-invalid-id-deferred">
<h3>ERROR: 404 error with deferred loading</h3>
<oppia oppia-id="fake_id" autoload="false"></oppia>
</div>
</div>

<script type="text/javascript">
// To keep track of next exploration id to be replaced.
var placeholderExplorationId = 'idToBeReplaced';
var onChangeExpId = function() {
var newExplorationId = $(
'.protractor-test-exploration-id-input-field').val();
$('div > iframe').each(function(index) {
var src = $(this).attr('src');
src = src.replace(placeholderExplorationId, newExplorationId);
$(this).attr('src', src);
});
placeholderExplorationId = newExplorationId;

// For first time loading of deferred loading version.
$('oppia[oppia-id="idToBeReplaced"]').each(function(index) {
$(this).attr('oppia-id', newExplorationId);
});

// Show the contents.
$('.protractor-test-results').show();
};
</script>
75 changes: 55 additions & 20 deletions assets/scripts/embedding_tests_dev_0.0.2.min.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,66 @@ <h2>v0.0.2 (minified)</h2>
the Oppia iframe to the containing page.
</p>

<style type="text/css">
.protractor-test-results {
display: none;
}
</style>

<script src="/assets/scripts/oppia-player-0.0.2.min.js"></script>
<script src="/assets/scripts/embedding_tests.js"></script>
<script src="../../third_party/static/jquery-3.2.1/jquery.min.js"></script>

<div>
<h3>Iframe embedding</h3>
<iframe src="/embed/exploration/12" width="700" height="600">
</iframe>
</div>
<input class="protractor-test-exploration-id-input-field" type="text" placeholder="explorationId">
<input class="protractor-test-exploration-id-submit-button" type="submit" value="Update Exploration ID" onclick="onChangeExpId()">

<div class="protractor-test-standard">
<h3>Standard embedding of the latest version</h3>
<oppia oppia-id="12"></oppia>
</div>
<div class="protractor-test-results">
<div>
<h3>Iframe embedding</h3>
<iframe src="/embed/exploration/idToBeReplaced" width="700" height="600">
</iframe>
</div>

<div class="protractor-test-old-version">
<h3>Standard embedding of version 1 of the exploration</h3>
<oppia oppia-id="12" exploration-version="1"></oppia>
</div>
<div class="protractor-test-standard">
<h3>Standard embedding of the latest version</h3>
<oppia oppia-id="idToBeReplaced"></oppia>
</div>

<div class="protractor-test-missing-id">
<h3>ERROR: No oppia id specified</h3>
<oppia></oppia>
</div>
<div class="protractor-test-old-version">
<h3>Standard embedding of version 2 of the exploration</h3>
<oppia oppia-id="idToBeReplaced" exploration-version="2"></oppia>
</div>

<div class="protractor-test-invalid-id">
<h3>ERROR: 404 error</h3>
<oppia oppia-id="fake_id"></oppia>
<div class="protractor-test-missing-id">
<h3>ERROR: No oppia id specified</h3>
<oppia></oppia>
</div>

<div class="protractor-test-invalid-id">
<h3>ERROR: 404 error</h3>
<oppia oppia-id="fake_id"></oppia>
</div>
</div>

<script type="text/javascript">
// To keep track of next exploration id to be replaced.
var placeholderExplorationId = 'idToBeReplaced';
var onChangeExpId = function() {
var newExplorationId = $(
'.protractor-test-exploration-id-input-field').val();
$('div > iframe').each(function(index) {
var src = $(this).attr('src');
src = src.replace(placeholderExplorationId, newExplorationId);
$(this).attr('src', src);
});
placeholderExplorationId = newExplorationId;

// For first time loading of deferred loading version.
$('oppia[oppia-id="idToBeReplaced"]').each(function(index) {
$(this).attr('oppia-id', newExplorationId);
});

// Show the contents
$('.protractor-test-results').show();
};
</script>
36 changes: 33 additions & 3 deletions assets/scripts/embedding_tests_dev_i18n_0.0.1.html
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,40 @@
<h2>v0.0.1 (unminified)</h2>
<p>For instructions: see the README file in /assets/scripts.</p>

<style type="text/css">
.protractor-test-results {
display: none;
}
</style>

<script src="/assets/scripts/oppia-player-0.0.1.js"></script>
<script src="/assets/scripts/embedding_tests.js"></script>
<script src="../../third_party/static/jquery-3.2.1/jquery.min.js"></script>

<input class="protractor-test-exploration-id-input-field" type="text" placeholder="explorationId">
<input class="protractor-test-exploration-id-submit-button" type="submit" value="Update Exploration ID" onclick="onChangeExpId()">

<div class="protractor-test-embedded-exploration">
<h3>Standard embedding of the latest version</h3>
<oppia oppia-id="12"></oppia>
<div class="protractor-test-results">
<div class="protractor-test-embedded-exploration">
<h3>Standard embedding of the latest version</h3>
<oppia oppia-id="idToBeReplaced"></oppia>
</div>
</div>

<script type="text/javascript">
// To keep track of next exploration id to be replaced.
var placeholderExplorationId = 'idToBeReplaced';
var onChangeExpId = function() {
var newExplorationId = $(
'.protractor-test-exploration-id-input-field').val();
$('div > iframe').each(function(index) {
var src = $(this).attr('src');
src = src.replace(placeholderExplorationId, newExplorationId);
$(this).attr('src', src);
});
placeholderExplorationId = newExplorationId;

// Show the contents.
$('.protractor-test-results').show();
};
</script>
Loading

0 comments on commit 21564df

Please sign in to comment.