-
Notifications
You must be signed in to change notification settings - Fork 1.7k
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.
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
feat(config): a 3rd option to run the tests by dynamically loading test scripts without using iframe or new window #2542
Merged
dignifiedquire
merged 5 commits into
karma-runner:master
from
chan1cyrus2:loadtests_dynamically
Feb 19, 2017
Merged
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
64de40c
feat(config): a 3rd option to run the tests by dynamically loading te…
chan1cyrus2 cdc9ce1
feat(config): update flag name
chan1cyrus2 30afc61
feat(config): fix typo, add test
chan1cyrus2 cde6777
feat(config): add customizable html
chan1cyrus2 c968aa2
Update console.log
chan1cyrus2 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
PhantomJS 2.1.1 (Mac OS X 0.0.0) | ||
PhantomJS 2.1.1 (Mac OS X 0.0.0) | ||
PhantomJS 2.1.1 (Mac OS X 0.0.0) | ||
PhantomJS 2.1.1 (Mac OS X 0.0.0) | ||
PhantomJS 2.1.1 (Mac OS X 0.0.0) | ||
PhantomJS 2.1.1 (Linux 0.0.0) | ||
PhantomJS 2.1.1 (Linux 0.0.0) | ||
PhantomJS 2.1.1 (Linux 0.0.0) | ||
PhantomJS 2.1.1 (Linux 0.0.0) | ||
PhantomJS 2.1.1 (Linux 0.0.0) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,125 @@ | ||
|
||
<!DOCTYPE html> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. my bad |
||
<!-- | ||
This is the combined client and execution context. | ||
Is used for single-shot tests. | ||
--> | ||
<html> | ||
<head> | ||
|
||
<title>Karma</title> | ||
<link href="favicon.ico" rel="icon" type="image/x-icon"> | ||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> | ||
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" /> | ||
<style type="text/css"> | ||
iframe { | ||
height: 100%; | ||
width: 100%; | ||
border: 0; | ||
} | ||
|
||
html, body { | ||
height: 100%; | ||
padding: 0; | ||
margin: 0; | ||
|
||
font-family: sans-serif; | ||
} | ||
|
||
.offline { | ||
background: #DDD; | ||
} | ||
|
||
.online { | ||
background: #6C4; | ||
} | ||
|
||
.idle { | ||
} | ||
|
||
.executing { | ||
background: #F99; | ||
} | ||
|
||
#banner { | ||
padding: 5px 10px; | ||
} | ||
|
||
h1 { | ||
font-size: 1.8em; | ||
margin: 0; | ||
padding: 0; | ||
} | ||
|
||
ul { | ||
margin: 0; | ||
padding: 0; | ||
|
||
list-style: none; | ||
} | ||
|
||
li { | ||
padding: 5px 12px; | ||
} | ||
|
||
.btn-debug { | ||
float: right; | ||
} | ||
|
||
.offline .btn-debug { | ||
display: none; | ||
} | ||
|
||
.btn-debug { | ||
-moz-box-shadow:inset 0px 1px 0px 0px #ffffff; | ||
-webkit-box-shadow:inset 0px 1px 0px 0px #ffffff; | ||
box-shadow:inset 0px 1px 0px 0px #ffffff; | ||
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #ffffff), color-stop(1, #f6f6f6) ); | ||
background:-moz-linear-gradient( center top, #ffffff 5%, #f6f6f6 100% ); | ||
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f6f6f6'); | ||
background-color:#ffffff; | ||
-moz-border-radius:6px; | ||
-webkit-border-radius:6px; | ||
border-radius:6px; | ||
border:1px solid #dcdcdc; | ||
display:inline-block; | ||
color:#666666; | ||
font-family:arial; | ||
font-size:15px; | ||
font-weight:bold; | ||
padding:6px 24px; | ||
text-decoration:none; | ||
text-shadow:1px 1px 0px #ffffff; | ||
} | ||
|
||
.btn-debug:hover { | ||
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #f6f6f6), color-stop(1, #ffffff) ); | ||
background:-moz-linear-gradient( center top, #f6f6f6 5%, #ffffff 100% ); | ||
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f6f6f6', endColorstr='#ffffff'); | ||
background-color:#f6f6f6; | ||
} | ||
</style> | ||
</head> | ||
<body> | ||
<div id="banner" class="offline"> | ||
<h1 id="title">Karma - starting</h1> | ||
</div> | ||
<script src="socket.io/socket.io.js"></script> | ||
<script src="karma.js"></script> | ||
<script src="context.js"></script> | ||
<!-- The scripts need to be at the end of body, so that some test running frameworks | ||
(Angular Scenario, for example) need the body to be loaded so that it can insert its magic | ||
into it. If it is before body, then it fails to find the body and crashes and burns in an epic | ||
manner. --> | ||
<script type="text/javascript"> | ||
// sets window.__karma__ and overrides console and error handling | ||
%CLIENT_CONFIG% | ||
window.__karma__.setupContext(window); | ||
|
||
// All served files with the latest timestamps | ||
%MAPPINGS% | ||
%SCRIPT_URL_ARRAY% | ||
</script> | ||
<!-- Dynamically replaced with <script> tags --> | ||
</body> | ||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this seems like an unrelated change
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not even sure why this file exists in the first place tbh