added command line functionality- can now specify which local browser to run tests
Showing
2 changed files
with
59 additions
and
3 deletions
... | @@ -110,7 +110,6 @@ module.exports = function(grunt) { | ... | @@ -110,7 +110,6 @@ module.exports = function(grunt) { |
110 | }, | 110 | }, |
111 | karma: { | 111 | karma: { |
112 | options: { | 112 | options: { |
113 | configFile: 'test/karma.conf.js', | ||
114 | frameworks: ['qunit'] | 113 | frameworks: ['qunit'] |
115 | }, | 114 | }, |
116 | 115 | ||
... | @@ -120,9 +119,67 @@ module.exports = function(grunt) { | ... | @@ -120,9 +119,67 @@ module.exports = function(grunt) { |
120 | }, | 119 | }, |
121 | 120 | ||
122 | dev: { | 121 | dev: { |
122 | browsers: ['Chrome', 'Safari', 'Firefox', 'Opera', 'IE', 'PhantomJS', 'ChromeCanary'], | ||
123 | configFile: 'test/localkarma.conf.js', | ||
124 | autoWatch: true | ||
125 | }, | ||
126 | |||
127 | chromecanary: { | ||
128 | options: { | ||
129 | browsers: ['ChromeCanary'], | ||
130 | configFile: 'test/localkarma.conf.js', | ||
131 | autoWatch: true | ||
132 | } | ||
133 | }, | ||
134 | |||
135 | phantomjs: { | ||
136 | options: { | ||
137 | browsers: ['PhantomJS'], | ||
138 | configFile: 'test/localkarma.conf.js', | ||
139 | autoWatch: true | ||
140 | } | ||
141 | }, | ||
142 | |||
143 | opera: { | ||
144 | options: { | ||
145 | browsers: ['Opera'], | ||
146 | configFile: 'test/localkarma.conf.js', | ||
147 | autoWatch: true | ||
148 | } | ||
149 | }, | ||
150 | |||
151 | chrome: { | ||
152 | options: { | ||
153 | browsers: ['Chrome'], | ||
154 | configFile: 'test/localkarma.conf.js', | ||
155 | autoWatch: true | ||
156 | } | ||
157 | }, | ||
158 | |||
159 | safari: { | ||
160 | options: { | ||
161 | browsers: ['Safari'], | ||
162 | configFile: 'test/localkarma.conf.js', | ||
163 | autoWatch: true | ||
164 | } | ||
165 | }, | ||
166 | |||
167 | firefox: { | ||
168 | options: { | ||
169 | browsers: ['Firefox'], | ||
123 | configFile: 'test/localkarma.conf.js', | 170 | configFile: 'test/localkarma.conf.js', |
124 | autoWatch: true | 171 | autoWatch: true |
172 | } | ||
125 | }, | 173 | }, |
174 | |||
175 | ie: { | ||
176 | options: { | ||
177 | browsers: ['IE'], | ||
178 | configFile: 'test/localkarma.conf.js', | ||
179 | autoWatch: true | ||
180 | } | ||
181 | }, | ||
182 | |||
126 | ci: { | 183 | ci: { |
127 | configFile: 'test/karma.conf.js', | 184 | configFile: 'test/karma.conf.js', |
128 | autoWatch: false | 185 | autoWatch: false | ... | ... |
... | @@ -26,8 +26,7 @@ module.exports = function(config) { | ... | @@ -26,8 +26,7 @@ module.exports = function(config) { |
26 | // - PhantomJS | 26 | // - PhantomJS |
27 | // - IE (only Windows) | 27 | // - IE (only Windows) |
28 | // Example usage: | 28 | // Example usage: |
29 | browsers: ['Chrome','Firefox','Safari'], | 29 | // browsers: [], |
30 | |||
31 | // List of files / patterns to load in the browser | 30 | // List of files / patterns to load in the browser |
32 | // Add any new src files to this list. | 31 | // Add any new src files to this list. |
33 | // If you add new unit tests, they will be picked up automatically by Karma, | 32 | // If you add new unit tests, they will be picked up automatically by Karma, | ... | ... |
-
Please register or sign in to post a comment