diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/content/guide/expression.ngdoc | 4 | ||||
| -rw-r--r-- | docs/src/ngdoc.js | 19 | 
2 files changed, 19 insertions, 4 deletions
| diff --git a/docs/content/guide/expression.ngdoc b/docs/content/guide/expression.ngdoc index f1e2735b..99cc7514 100644 --- a/docs/content/guide/expression.ngdoc +++ b/docs/content/guide/expression.ngdoc @@ -110,6 +110,10 @@ prevent accidental access to the global state (a common source of subtle bugs).  </doc:source>  <doc:protractor>    it('should calculate expression in binding', function() { +    if (browser.params.browser = 'safari') { +      // Safari can't handle dialogs. +      return; +    };      element(by.css('[ng-click="greet()"]')).click();      var alertDialog = browser.switchTo().alert(); diff --git a/docs/src/ngdoc.js b/docs/src/ngdoc.js index 970f5c56..1e8896d0 100644 --- a/docs/src/ngdoc.js +++ b/docs/src/ngdoc.js @@ -1113,14 +1113,25 @@ function scenarios(docs){  function writeProtractorTest(doc){    var lines = [];    lines.push('describe("' + doc.section + '/' + doc.id + '", function() {'); -  lines.push('  beforeEach(function() {'); -  lines.push('    browser.get("index-nocache.html#!/' + doc.section + '/' + doc.id + '");'); -  lines.push('  });'); +  lines.push('  describe("angular+jqLite", function() {') +  lines.push('    beforeEach(function() {'); +  lines.push('      browser.get("index-nocache.html#!/' + doc.section + '/' + doc.id + '");'); +  lines.push('    });');    lines.push('');    doc.protractorTests.forEach(function(test){ -    lines.push(indentCode(trim(test), 2)); +    lines.push(indentCode(trim(test), 4)); +    lines.push(''); +  }); +  lines.push('  });'); +  lines.push('  describe("angular+jQuery", function() {') +  lines.push('    beforeEach(function() {'); +  lines.push('      browser.get("index-jq-nocache.html#!/' + doc.section + '/' + doc.id + '");'); +  lines.push('    });'); +  doc.protractorTests.forEach(function(test){ +    lines.push(indentCode(trim(test), 4));      lines.push('');    }); +  lines.push('  });');    lines.push('});');    lines.push('');    return lines.join('\n'); | 
