diff options
Diffstat (limited to 'docs/content/tutorial/step_05.ngdoc')
| -rw-r--r-- | docs/content/tutorial/step_05.ngdoc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/content/tutorial/step_05.ngdoc b/docs/content/tutorial/step_05.ngdoc index 357bbf5b..f717528d 100644 --- a/docs/content/tutorial/step_05.ngdoc +++ b/docs/content/tutorial/step_05.ngdoc @@ -42,7 +42,7 @@ Following is a sample of the file: ## Controller -We'll use Angular's {@link api/ng.$http $http} service in our controller to make an HTTP +We'll use Angular's {@link ng.$http $http} service in our controller to make an HTTP request to your web server to fetch the data in the `app/phones/phones.json` file. `$http` is just one of several built-in {@link guide/dev_guide.services angular services} that handle common operations in web apps. Angular injects these services for you where you need them. @@ -72,7 +72,7 @@ relative to our `index.html` file). The server responds by providing the data in browser and our app they both look the same. For the sake of simplicity we used a json file in this tutorial.) -The `$http` service returns a {@link api/ng.$q promise object} with a `success` +The `$http` service returns a {@link ng.$q promise object} with a `success` method. We call this method to handle the asynchronous response and assign the phone data to the scope controlled by this controller, as a model called `phones`. Notice that angular detected the json response and parsed it for us! @@ -193,15 +193,15 @@ describe('PhoneCat controllers', function() { ``` Note: Because we loaded Jasmine and `angular-mocks.js` in our test environment, we got two helper -methods {@link api/angular.mock.module module} and {@link api/angular.mock.inject inject} that we'll +methods {@link angular.mock.module module} and {@link angular.mock.inject inject} that we'll use to access and configure the injector. We created the controller in the test environment, as follows: * We used the `inject` helper method to inject instances of -{@link api/ng.$rootScope $rootScope}, -{@link api/ng.$controller $controller} and -{@link api/ng.$httpBackend $httpBackend} services into the Jasmine's `beforeEach` +{@link ng.$rootScope $rootScope}, +{@link ng.$controller $controller} and +{@link ng.$httpBackend $httpBackend} services into the Jasmine's `beforeEach` function. These instances come from an injector which is recreated from scratch for every single test. This guarantees that each test starts from a well known starting point and each test is isolated from the work done in other tests. |